From a10893eaad8de6891533d229e25085ef87b6d261 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 19 Jun 2019 11:23:12 +0300
Subject: [PATCH 1/2] Fixed error in `ImageMedium::url()` if the image cache
 folder does not exist

---
 CHANGELOG.md                                       | 6 ++++++
 system/src/Grav/Common/Page/Medium/ImageMedium.php | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb00c69ee..b296a149a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.6.11
+## mm/dd/2019
+
+1. [](#bugfix)
+    * Fixed error in `ImageMedium::url()` if the image cache folder does not exist
+
 # v1.6.10
 ## 06/14/2019
 
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index ac292191a..936f696a9 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -170,8 +170,7 @@ class ImageMedium extends Medium
     {
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
-        $image_path = $locator->findResource('cache://images', true);
-        $image_dir = $locator->findResource('cache://images', false);
+        $image_path = $locator->findResource('cache://images', true) ?: $locator->findResource('cache://images', true, true);
         $saved_image_path = $this->saveImage();
 
         $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $saved_image_path);
@@ -181,6 +180,7 @@ class ImageMedium extends Medium
         }
 
         if (Utils::startsWith($output, $image_path)) {
+            $image_dir = $locator->findResource('cache://images', false);
             $output = '/' . $image_dir . preg_replace('|^' . preg_quote($image_path, '|') . '|', '', $output);
         }
 

From ac9ef4da76a5300a9fd1a296299d3be73a4f2999 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 19 Jun 2019 20:56:23 +0300
Subject: [PATCH 2/2] Fixed empty form flash name after update

---
 CHANGELOG.md                                 | 1 +
 system/src/Grav/Framework/Form/FormFlash.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b296a149a..15a9415ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fixed error in `ImageMedium::url()` if the image cache folder does not exist
+    * Fixed empty form flash name after update
 
 # v1.6.10
 ## 06/14/2019
diff --git a/system/src/Grav/Framework/Form/FormFlash.php b/system/src/Grav/Framework/Form/FormFlash.php
index 50607822c..75ce6ebd3 100644
--- a/system/src/Grav/Framework/Form/FormFlash.php
+++ b/system/src/Grav/Framework/Form/FormFlash.php
@@ -66,7 +66,7 @@ class FormFlash implements \JsonSerializable
             } catch (\Exception $e) {
                 $data = [];
             }
-            $this->formName = null !== $formName ? $content['form'] ?? '' : '';
+            $this->formName = $content['form'] ?? $formName;
             $this->url = $data['url'] ?? '';
             $this->user = $data['user'] ?? null;
             $this->data = $data['data'] ?? null;