From 39081371ffd41a851e4b756d7699a20f0e700555 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 14 Nov 2023 13:54:39 +0100 Subject: [PATCH] wip #6316 @1 --- app/Fluidbook/Compiler/Compiler.php | 2 +- app/Fluidbook/Compiler/Stats.php | 4 ++-- .../Admin/Operations/FluidbookPublication/LinksOperation.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index 5c590ae84..1fa5cf63f 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -1531,7 +1531,7 @@ class Compiler extends Base implements CompilerInterface } if (!$reminimize) { - if (filemtime(__FILE__) > $mintime || (file_exists(__DIR__ . '/class.ws.html5.links.php') && filemtime(__DIR__ . '/class.ws.html5.links.php') > $mintime)) { + if (filemtime(__FILE__) > $mintime) { $reminimize = true; } } diff --git a/app/Fluidbook/Compiler/Stats.php b/app/Fluidbook/Compiler/Stats.php index b75574e79..0d2c91a7a 100644 --- a/app/Fluidbook/Compiler/Stats.php +++ b/app/Fluidbook/Compiler/Stats.php @@ -69,7 +69,7 @@ height="0" width="0" style="display:none;visibility:hidden"> } } else if ($this->fluidbookSettings->tagcommander_plan_type === 'esm') { $default = [ - 'env_ati_id' => 576078, + 'env_ati_id' => 576089, 'page_name' => 'magazine', 'env_work' => $this->fluidbookSettings->tagcommander_prod ? 'prod' : 'pre-prod', 'page_level_name' => 'fluidbook', @@ -81,7 +81,7 @@ height="0" width="0" style="display:none;visibility:hidden"> $id .= '/uat'; } $scriptNames = ['tc_Multisite_Medias.js', 'tc_Multisite_Analytics.js']; - $this->addJsLib('esm', ['js/fluidbook/stats/fluidbook.stats.esm.js']); + $this->addJsLib('esm', ['js/libs/fluidbook/stats/fluidbook.stats.esm.js']); } if (isset($id)) { diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php index 8bae9ef5b..5c7e3036b 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 json_decode(request('rulers', '[]'), true), ); - $fb = FluidbookPublication::find($fluidbook_id); + $fb = FluidbookPublication::withoutGlobalScopes()->find($fluidbook_id); return response()->json(['assets' => $fb->getLinksAssetsDimensions(), 'versions' => LinksData::getLinksVersions($fluidbook_id)]); } -- 2.39.5