From 5ad4ffd3cf7e5cc2ef65f8e29d877a5c1bc04dbd Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 25 Jan 2019 12:12:04 +0200
Subject: [PATCH] FormFlash: Fixed some image cropping issues

---
 system/src/Grav/Common/Form/FormFlash.php    | 41 +-------------------
 system/src/Grav/Framework/Form/FormFlash.php |  2 +-
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/system/src/Grav/Common/Form/FormFlash.php b/system/src/Grav/Common/Form/FormFlash.php
index f0387c14d..2891a8c3c 100644
--- a/system/src/Grav/Common/Form/FormFlash.php
+++ b/system/src/Grav/Common/Form/FormFlash.php
@@ -101,28 +101,9 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
         }
 
         $upload['file']['tmp_name'] = $basename;
-
-        if (!isset($this->files[$field])) {
-            $this->files[$field] = [];
-        }
-
-        // Prepare object for later save
         $upload['file']['name'] = $filename;
 
-        // Replace old file, including original
-        $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'];
+        $this->addFileInternal($field, $filename, $upload['file']);
 
         return true;
     }
@@ -149,27 +130,9 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
         }
 
         $upload['file']['tmp_name'] = $basename;
-
-        if (!isset($this->files[$field])) {
-            $this->files[$field] = [];
-        }
-
-        // Prepare object for later save
         $upload['file']['name'] = $filename;
 
-        $oldUpload = $this->files[$field][$filename] ?? null;
-        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'];
+        $this->addFileInternal($field, $filename, $upload['file'], $crop);
 
         return true;
     }
diff --git a/system/src/Grav/Framework/Form/FormFlash.php b/system/src/Grav/Framework/Form/FormFlash.php
index 134040c37..15e7ddd51 100644
--- a/system/src/Grav/Framework/Form/FormFlash.php
+++ b/system/src/Grav/Framework/Form/FormFlash.php
@@ -401,7 +401,7 @@ class FormFlash implements \JsonSerializable
                 $originalUpload = $this->files[$field . '/original'][$name] ?? null;
                 if ($originalUpload) {
                     // 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'] ?? '');
                 } else {
                     // Otherwise make the previous file as original