Merge branch 'develop' into 1.9

# Conflicts:
#	classes/admincontroller.php
#	themes/grav/js/admin.min.js
#	themes/grav/js/vendor.min.js
#	themes/grav/package-lock.json
This commit is contained in:
Andy Miller
2018-09-29 13:10:10 -06:00
19 changed files with 826 additions and 8718 deletions

View File

@@ -360,7 +360,7 @@ class AdminPlugin extends Plugin
}
// Make local copy of POST.
$post = !empty($_POST) ? $_POST : [];
$post = $this->grav['uri']->post();
// Handle tasks.
$this->admin->task = $task = !empty($post['task']) ? $post['task'] : $this->uri->param('task');