Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-02-28 09:31:28 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into 1.10

Browse Source 
 Conflicts:
	CHANGELOG.md
This commit is contained in:
Matias Griese
2019-09-17 21:59:57 +03:00
parent 939ab13494 927ccfa526
commit 8ad9fc2f45
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -87,6 +87,12 @@
1. [](#bugfix)
* Fixed admin caching issues
# 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

2
themes/grav/templates/forms/fields/file/file.html.twig
View File

@@ -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 %}