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

Merge branch 'develop' into 1.10

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	blueprints.yaml
This commit is contained in:
Andy Miller
2019-12-04 16:20:43 -07:00
parent 56832a5fba ec07a89223
commit b2e5508d0f
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,5 +1,5 @@
# v1.10.0-rc.2 # v1.10.0-rc.2
## mm/dd/2019 ## 12/04/2019
1. [](#new) 1. [](#new)
* Added support for hiding parts of admin by `Deny` permissions (`Flex Users` only) * Added support for hiding parts of admin by `Deny` permissions (`Flex Users` only)
@@ -128,6 +128,12 @@
1. [](#bugfix) 1. [](#bugfix)
* Fixed admin caching issues * Fixed admin caching issues
# v1.9.12
## 12/04/2019
1. [](#bugfix)
* Fixed saving configuration in PHP 7.4
# v1.9.11 # v1.9.11
## 11/06/2019 ## 11/06/2019

2
classes/plugin/AdminBaseController.php
View File

@@ -734,8 +734,8 @@ class AdminBaseController
// Process previously uploaded files for the current URI // Process previously uploaded files for the current URI
// and finally store them. Everything else will get discarded // and finally store them. Everything else will get discarded
$queue = $this->admin->session()->getFlashObject('files-upload'); $queue = $this->admin->session()->getFlashObject('files-upload');
$queue = $queue[base64_encode($this->grav['uri']->url())];
if (is_array($queue)) { if (is_array($queue)) {
$queue = $queue[base64_encode($this->grav['uri']->url())];
foreach ($queue as $key => $files) { foreach ($queue as $key => $files) {
foreach ($files as $destination => $file) { foreach ($files as $destination => $file) {
if (!rename($file['tmp_name'], $destination)) { if (!rename($file['tmp_name'], $destination)) {