wait #5851 @0.25

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 7d72f9d62db203ead80404892255716ed2073ea6..76952ee81a326d70ec4fc1801318d172fcaad74d 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -3172,7 +3172,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
      */
     public static function compile($fluidbook, $scormVariant = false, $hybrid = false, $sync = false)
     {
-        $compiler = new static($fluidbook instanceof FluidbookPublication ?: FluidbookPublication::withoutGlobalScopes()->find($fluidbook), scormVariant: $scormVariant, hybrid: $hybrid);
+        $compiler = new static($fluidbook instanceof FluidbookPublication ? $fluidbook : FluidbookPublication::withoutGlobalScopes()->find($fluidbook), scormVariant: $scormVariant, hybrid: $hybrid);
         if ($sync) {
             $compiler->handle();
         } else {

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
index 95372fa72970d0fe3a9a98cd7044e4b68104cb78..45a0f945a30e2882dab1929ea08779b16348fe89 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
@@ -62,7 +62,7 @@ trait LinksOperation
         );
 
         $fb = FluidbookPublication::find($fluidbook_id);
-        Compiler::compile($fb);
+        //Compiler::compile($fb);
 
         return response()->json(['assets' => $fb->getLinksAssetsDimensions(), 'versions' => LinksData::getLinksVersions($fluidbook_id)]);
     }

diff --git a/bin/startup.sh b/bin/startup.sh
index ebc6e142619d0d4322e5e1c1b06550d0c740fecf..6208eabdcc0143ecbebe8c5872a5253af08aa54c 100644 (file)
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -11,6 +11,7 @@ chmod 750 /application
 chmod 600 /application/.ssh/id_rsa
 chmod 700 /application/.ssh/
 chmod 600 /application/.ssh/authorized_keys2
+chown -R toolbox:www-data /application/.ssh
 chmod 600 /root/.ssh/id_rsa
 chmod 700 /root/.ssh/
 chmod 600 /root/.ssh/authorized_keys2