wip #5393 @0:10

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
index 6c1d8cee9111a2c2537b0f31932c3b56c0b472e8..82510514928dbacf787fbb8ab66b91d8063e5a00 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
@@ -100,6 +100,9 @@ trait PreviewOperation
         PHP::neverStop(false);
 
         self::_getFluidbookAndTheme($id, $hash, $fluidbook, $theme);
+        if (null === $theme || null === $fluidbook) {
+            abort(404);
+        }
         $res = $this->_loadingCompile($theme, $fluidbook->title, $url);
         return response($res);
     }

diff --git a/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php b/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php
index 1e2b0054ff8bb62935660d5591643bd2a09947c0..2bfe24931dc3afdbc6646618a9747a7d3ffadbb9 100644 (file)
--- a/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php
+++ b/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php
@@ -11,7 +11,9 @@ class CheckPublicationsHashAndCid extends Base
     public function handle()
     {
         /** @var FluidbookPublication $fluidbook */
-        foreach (FluidbookPublication::withoutGlobalScopes()->where('created_ok', '1')->whereNull('hash')->orWhere('hash', '')->orWhereNull('cid')->orWhere('cid', '')->get() as $fluidbook) {
+        foreach (FluidbookPublication::withoutGlobalScopes()->where('created_ok', '1')->where(function ($query) {
+            $query->whereNull('hash')->orWhere('hash', '')->orWhereNull('cid')->orWhere('cid', '');
+        })->get() as $fluidbook) {
             Log::warning('Fluidbook #' . $fluidbook->id . ' had empty hash or cid (hash: hash , cid: :cid)', ['hash' => $fluidbook->hash, 'cid' => $fluidbook->cid]);
             $fluidbook->save();
         }