wait #7288 @1

diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php
index 0d4e1a7429b648b85a7e712cedb2f10f18e7fcbf..6b09bf478ac1b4d0e0c87a10fc1aa09f05edb209 100644 (file)
--- a/app/Fluidbook/Link/LinksData.php
+++ b/app/Fluidbook/Link/LinksData.php
@@ -159,15 +159,20 @@ class LinksData
         $file = Files::firstThatExists($dir . '/' . $time . '.links3.gz', $dir . '/' . $time . '.links.gz');
         $metafile = Files::firstThatExists($dir . '/' . $time . '.meta3.gz', $dir . '/' . $time . '.meta.gz');
         if ($time === 'latest' && !file_exists($file)) {
-
             foreach ($versions as $version => $m) {
-                $lf = Files::firstThatExists($dir . '/' . $version . '.links3.gz', $dir . '/' . $version . '.links.gz');
-                $mf = Files::firstThatExists($dir . '/' . $version . '.meta3.gz', $dir . '/' . $version . '.meta.gz');
+                if ($version < 100000 && isset($m['timestamp'])) {
+                    $version = $m['timestamp'];
+                }
+                $lf = Files::firstThatExists($dir . $version . '.links3.gz', $dir . $version . '.links.gz');
+                $mf = Files::firstThatExists($dir . $version . '.meta3.gz', $dir . $version . '.meta.gz');
+
                 if (!file_exists($lf) || !file_exists($mf)) {
                     continue;
                 }
-                copy($lf, $dir . '/latest.links3.gz');
-                copy($mf, $dir . '/latest.meta3.gz');
+                copy($lf, $dir . 'latest.links3.gz');
+                copy($mf, $dir . 'latest.meta3.gz');
+                $file = $dir . 'latest.links3.gz';
+                $metafile = $dir . 'latest.meta3.gz';
                 break;
             }
         }
@@ -251,7 +256,7 @@ class LinksData
     {
         $res = [];
         foreach ($items as $item) {
-            if (empty($item['uid']) || isset($res[$item['uid']])) {
+            if (!isset($item['uid']) || empty($item['uid']) || isset($res[$item['uid']])) {
                 $item['uid'] = self::generateUID();
             }
             $res[$item['uid']] = $item;

diff --git a/resources/linkeditor-stable/js/linkeditor.loader.js b/resources/linkeditor-stable/js/linkeditor.loader.js
index 09fdaa92897f6141ed15c434e6ca0a2671b100fa..91c4171487254e2746e3db33b85f94f89c331fb2 100644 (file)
--- a/resources/linkeditor-stable/js/linkeditor.loader.js
+++ b/resources/linkeditor-stable/js/linkeditor.loader.js
@@ -70,7 +70,7 @@ LinkeditorLoader.prototype = {
     },
 
     _loadPage: function (p, container) {
-        var imageFormat = FLUIDBOOK_DATA.settings.imageFormat;
+        var imageFormat = FLUIDBOOK_DATA.settings.imageFormat ?? 'jpg';
         var c = '<div class="contents">';
         if (this.linkeditor.utils.isSpecialPage(p)) {
             let data = this.linkeditor.utils.getSpecialPageAssetData(p);

diff --git a/resources/linkeditor/js/linkeditor.loader.js b/resources/linkeditor/js/linkeditor.loader.js
index 09fdaa92897f6141ed15c434e6ca0a2671b100fa..91c4171487254e2746e3db33b85f94f89c331fb2 100644 (file)
--- a/resources/linkeditor/js/linkeditor.loader.js
+++ b/resources/linkeditor/js/linkeditor.loader.js
@@ -70,7 +70,7 @@ LinkeditorLoader.prototype = {
     },
 
     _loadPage: function (p, container) {
-        var imageFormat = FLUIDBOOK_DATA.settings.imageFormat;
+        var imageFormat = FLUIDBOOK_DATA.settings.imageFormat ?? 'jpg';
         var c = '<div class="contents">';
         if (this.linkeditor.utils.isSpecialPage(p)) {
             let data = this.linkeditor.utils.getSpecialPageAssetData(p);