From c455fa08c2245dab42e892c1d2fb828829fb83e6 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Thu, 13 May 2021 11:00:50 +1200 Subject: [PATCH] Ensure absolute path for watermark --- code/tasks/FTFileMakerTask.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/tasks/FTFileMakerTask.php b/code/tasks/FTFileMakerTask.php index 0d80ffe..f1008bf 100644 --- a/code/tasks/FTFileMakerTask.php +++ b/code/tasks/FTFileMakerTask.php @@ -346,6 +346,7 @@ class FTFileMakerTask extends BuildTask $watermarkPath = ModuleResourceLoader::singleton()->resolvePath( 'silverstripe/frameworktest: images/silverstripe.png' ); + $absWatermarkPath = Path::join(BASE_PATH, $watermarkPath); for ($i = 1; $i <= $folderCount; $i++) { $folder = new Folder([ @@ -386,7 +387,7 @@ class FTFileMakerTask extends BuildTask if ($class === Image::class && $uniqueImages) { $copyPath = Path::join(dirname($randomFilePath), $fileName); copy($randomFilePath, $copyPath); - $newPath = $this->watermarkImage($watermarkPath, $copyPath); + $newPath = $this->watermarkImage($absWatermarkPath, $copyPath); if ($newPath) { $randomFilePath = $newPath; }