From 927ccfa526fcd58fb65163112c7761809b8c5b70 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 17 Sep 2019 21:58:48 +0300
Subject: [PATCH 1/2] Fixed `Badly encoded JSON data` warning when uploading
 files [grav#2663]

---
 CHANGELOG.md                                           | 6 ++++++
 themes/grav/templates/forms/fields/file/file.html.twig | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e2c5ce..82135cb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.9.10
+## mm/dd/2019
+
+1. [](#bugfix)
+    * Fixed `Badly encoded JSON data` warning when uploading files [grav#2663](https://github.com/getgrav/grav/issues/2663)
+
 # v1.9.9
 ## 08/21/2019
 
diff --git a/themes/grav/templates/forms/fields/file/file.html.twig b/themes/grav/templates/forms/fields/file/file.html.twig
index 7658b9e6..ccc3953c 100644
--- a/themes/grav/templates/forms/fields/file/file.html.twig
+++ b/themes/grav/templates/forms/fields/file/file.html.twig
@@ -107,7 +107,7 @@
     {% for path, file in value %}
         {{ macro.preview(path, file, _context) }}
     {% endfor %}
-    {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value: value|json_encode} %}
+    {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value: (value ?? [])|json_encode} %}
     </div>
 
     {% else %}

From 71c75af8486a9c3c0dda56182a306cfed39a5f33 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 19 Sep 2019 16:35:26 -0600
Subject: [PATCH 2/2] prepare for release

---
 CHANGELOG.md    | 2 +-
 blueprints.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82135cb1..dd8dcaf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # v1.9.10
-## mm/dd/2019
+## 09/19/2019
 
 1. [](#bugfix)
     * Fixed `Badly encoded JSON data` warning when uploading files [grav#2663](https://github.com/getgrav/grav/issues/2663)
diff --git a/blueprints.yaml b/blueprints.yaml
index 38fedfaa..cffe0fab 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.9.9
+version: 1.9.10
 testing: false
 description: Adds an advanced administration panel to manage your site
 icon: empire
@@ -14,7 +14,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.6.7' }
+    - { name: grav, version: '>=1.6.8' }
     - { name: form, version: '>=3.0.0' }
     - { name: login, version: '>=3.0.0' }
     - { name: email, version: '>=3.0.0' }