From ec542ac2a747ce4082c7fd0680fe108712d707ca Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 10 Feb 2023 19:29:04 +0100 Subject: [PATCH] wait #5721 @1 --- app/Jobs/FluidbookCompiler.php | 6 ++++++ app/Models/FluidbookPublication.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Jobs/FluidbookCompiler.php b/app/Jobs/FluidbookCompiler.php index 44667a345..128c80687 100644 --- a/app/Jobs/FluidbookCompiler.php +++ b/app/Jobs/FluidbookCompiler.php @@ -2830,6 +2830,9 @@ height="0" width="0" style="display:none;visibility:hidden"> $opt = $this->wdir . '/' . $clean; if (!file_exists($opt) || !filesize($opt) || filemtime($path) > filemtime($opt)) { + if (file_exists($opt) && is_link($opt)) { + unlink($opt); + } SVGTools::_optimizeSVG($path, $opt); } return $clean; @@ -3435,6 +3438,9 @@ height="0" width="0" style="display:none;visibility:hidden"> if (file_exists($fixed) && filemtime($fixed) >= filemtime($source)) { return $fixed; } + if (file_exists($fixed) && is_link($fixed)) { + unlink($fixed); + } $svg = simplexml_load_string(file_get_contents($source)); $attr = $svg->attributes(); if (isset($attr['width'], $attr['height'])) { diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 33e31809d..2a5b5e368 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -352,12 +352,12 @@ class FluidbookPublication extends ToolboxSettingsModel public function getAssetDir() { - return Files::mkdir('/application/protected/fluidbookpublication/working/' . $this->id); + return Files::mkdir(protected_path('fluidbookpublication/working/' . $this->id)); } public function asset_path($path) { - return $this->getAssetDir() . '/' . $path; + return $this->getAssetDir() . ltrim($path,'/'); } public function getCompositionUpdate(): int -- 2.39.5