From 53f17652b4aae520ea5c57f9c32d325228d7e434 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 25 Sep 2023 10:23:53 +0200 Subject: [PATCH] wip #6011 @.25 --- .../Operations/FluidbookCollection/PreviewOperation.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php index 12f95a1d5..15247de26 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php @@ -99,15 +99,17 @@ trait PreviewOperation */ protected static function _getCollectionAndTheme($id, $hash, &$collection, &$theme) { - $collection = FluidbookCollection::find($id)->where('hash', $hash)->first(); + $collection = FluidbookCollection::withoutGlobalScopes()->where('id', $id)->where('hash', $hash)->first(); if (null === $collection) { abort(404); } foreach ($collection->publications as $pub) { - $firstFluidbookId = $pub['fluidbook']; + $fluidbook = FluidbookPublication::withoutGlobalScopes()->find( $pub['fluidbook']); + if (null === $fluidbook) { + continue; + } break; } - $fluidbook = FluidbookPublication::find($firstFluidbookId); if (!isset($theme)) { $theme = $fluidbook->getTheme(); } -- 2.39.5