wait #7946 @0.25

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 5c3929651ecbe0a8a45ec8c180c1f273bf6eb7c2..53f40badb9cd28a702fbe60c345a6a5f7b281de2 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -313,7 +313,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
      * @throws \Exception
      */
 
-    function __construct(FluidbookPublication $book, $variant = 'online', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false, ?FluidbookTheme $theme, $hybrid = false, ?Command $command)
+    function __construct(FluidbookPublication $book, $variant = 'online', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false, FluidbookTheme $theme=null, $hybrid = false, Command $command=null)
     {
         ExcelToArray::setCache($book->protected_path('fluidbookpublication/cache/exceltoarray'));
         YoutubeDL::setCookiesFile(resource_path('yt-dlp/cookies.txt'), 'firefox');

diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php
index 6142c98d17511df573d4e030a3f03a88f618fafa..db8d24950a3f15b715729039f1e64b6c2f4e06a9 100644 (file)
--- a/app/Fluidbook/Link/LinksData.php
+++ b/app/Fluidbook/Link/LinksData.php
@@ -626,14 +626,18 @@ class LinksData
             }
         }
         if (!isset(static::$_names[$u])) {
-            $u=User::find($u);
-            if($u){
-                static::$_names[$u] = $u->name;
+            $u = User::find($u);
+            if ($u) {
+                $uid = $u->id;
+                static::$_names[$uid] = $u->name;
             } else {
-                static::$_names[$u] = '-';
+                $uid = $u;
+                static::$_names[$uid] = '-';
             }
+        } else {
+            $uid = $u;
         }
-        return static::$_names[$u];
+        return static::$_names[$uid];
     }
 
     public static function getMeta($book_id, $update = 'latest')

diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php
index d3c27470200e9da314ecbfbfafe0f110f1e43bcf..4b0e8977fdd6d77c7a8b07855ec63a69611e3d7f 100644 (file)
--- a/app/SubForms/Link/Base.php
+++ b/app/SubForms/Link/Base.php
@@ -355,7 +355,7 @@ class Base extends Form
      * @return string
      */
 
-    public function render(?callable $callback)
+    public function render(?callable $callback=null)
     {
         return view('fluidbook_publication.link_editor_form', ['form' => $this, 'crud' => $this->crud])->render($callback);
     }