tonyair/silverstripe-frameworktest
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-frameworktest synced 2024-10-22 11:06:02 +02:00
Code Issues Projects Releases Wiki Activity

Ensure absolute path for watermark

Browse Source
This commit is contained in:
Aaron Carlino 2021-05-13 11:00:50 +12:00
parent f932f5e110
commit c455fa08c2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/tasks/FTFileMakerTask.php
View File

@ -346,6 +346,7 @@ class FTFileMakerTask extends BuildTask
$watermarkPath = ModuleResourceLoader::singleton()->resolvePath( $watermarkPath = ModuleResourceLoader::singleton()->resolvePath(
'silverstripe/frameworktest: images/silverstripe.png' 'silverstripe/frameworktest: images/silverstripe.png'
); );
$absWatermarkPath = Path::join(BASE_PATH, $watermarkPath);
for ($i = 1; $i <= $folderCount; $i++) { for ($i = 1; $i <= $folderCount; $i++) {
$folder = new Folder([ $folder = new Folder([
@ -386,7 +387,7 @@ class FTFileMakerTask extends BuildTask
if ($class === Image::class && $uniqueImages) { if ($class === Image::class && $uniqueImages) {
$copyPath = Path::join(dirname($randomFilePath), $fileName); $copyPath = Path::join(dirname($randomFilePath), $fileName);
copy($randomFilePath, $copyPath); copy($randomFilePath, $copyPath);
$newPath = $this->watermarkImage($watermarkPath, $copyPath); $newPath = $this->watermarkImage($absWatermarkPath, $copyPath);
if ($newPath) { if ($newPath) {
$randomFilePath = $newPath; $randomFilePath = $newPath;
} }