From 25d44dbd2e899fb47a13a1eed258a910a25948fd Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 9 May 2023 12:59:40 +0200 Subject: [PATCH] wait #5851 @0.25 --- app/Fluidbook/Compiler/Compiler.php | 2 +- .../Admin/Operations/FluidbookPublication/LinksOperation.php | 2 +- bin/startup.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index 7d72f9d62..76952ee81 100644 --- 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"> */ 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 95372fa72..45a0f945a 100644 --- 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 ebc6e1426..6208eabdc 100644 --- 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 -- 2.39.5