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

FormFlash: Fixed some image cropping issues

Browse Source
This commit is contained in:
Matias Griese
2019-01-25 12:12:04 +02:00
parent 0700e4bfdb
commit 5ad4ffd3cf
2 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
system/src/Grav/Common/Form/FormFlash.php
View File

@@ -101,28 +101,9 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
} }
$upload['file']['tmp_name'] = $basename; $upload['file']['tmp_name'] = $basename;
if (!isset($this->files[$field])) {
$this->files[$field] = [];
}
// Prepare object for later save
$upload['file']['name'] = $filename; $upload['file']['name'] = $filename;
// Replace old file, including original $this->addFileInternal($field, $filename, $upload['file']);
$oldUpload = $this->files[$field][$filename] ?? null;
if (isset($oldUpload['tmp_name'])) {
$this->removeTmpFile($oldUpload['tmp_name']);
}
$originalUpload = $this->files[$field . '/original'][$filename] ?? null;
if (isset($originalUpload['tmp_name'])) {
$this->removeTmpFile($originalUpload['tmp_name']);
unset($this->files[$field . '/original'][$filename]);
}
// Prepare data to be saved later
$this->files[$field][$filename] = $upload['file'];
return true; return true;
} }
@@ -149,27 +130,9 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
} }
$upload['file']['tmp_name'] = $basename; $upload['file']['tmp_name'] = $basename;
if (!isset($this->files[$field])) {
$this->files[$field] = [];
}
// Prepare object for later save
$upload['file']['name'] = $filename; $upload['file']['name'] = $filename;
$oldUpload = $this->files[$field][$filename] ?? null; $this->addFileInternal($field, $filename, $upload['file'], $crop);
if ($oldUpload) {
$originalUpload = $this->files[$field . '/original'][$filename] ?? null;
if ($originalUpload) {
$this->removeTmpFile($oldUpload['tmp_name']);
} else {
$oldUpload['crop'] = $crop;
$this->files[$field . '/original'][$filename] = $oldUpload;
}
}
// Prepare data to be saved later
$this->files[$field][$filename] = $upload['file'];
return true; return true;
} }

2
system/src/Grav/Framework/Form/FormFlash.php
View File

@@ -401,7 +401,7 @@ class FormFlash implements \JsonSerializable
$originalUpload = $this->files[$field . '/original'][$name] ?? null; $originalUpload = $this->files[$field . '/original'][$name] ?? null;
if ($originalUpload) { if ($originalUpload) {
// If there is original file already present, remove the modified file // If there is original file already present, remove the modified file
$originalUpload['crop'] = $crop; $this->files[$field . '/original'][$name]['crop'] = $crop;
$this->removeTmpFile($oldUpload['tmp_name'] ?? ''); $this->removeTmpFile($oldUpload['tmp_name'] ?? '');
} else { } else {
// Otherwise make the previous file as original // Otherwise make the previous file as original