Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-06 10:48:29 +02:00
Code Issues Packages Projects Releases Activity

FlexMediaTrait: Cropping existing image without original fails to move the original image to safe place

Browse Source
This commit is contained in:
Matias Griese
2018-12-13 23:14:31 +02:00
parent 6828114e86
commit 2ad66102d2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
View File

@@ -125,6 +125,11 @@ trait FlexMediaTrait
}
if ($uploadedFile->getError() === \UPLOAD_ERR_OK) {
$uploadedFile->moveTo($filepath);
} elseif (!file_exists($filepath) && $pos = strpos($filename, '/')) {
$origpath = sprintf('%s/%s', $path, substr($filename, $pos));
if (file_exists($origpath)) {
copy($origpath, $filepath);
}
}
} else {
$uploadedFile->moveTo($filepath);
@@ -172,7 +177,6 @@ trait FlexMediaTrait
}
if (file_exists($targetFile)) {
$result = unlink($targetFile);
if (!$result) {
throw new RuntimeException($language->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);