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

@@ -595,7 +595,8 @@ class Admin
}
if (!$post) {
$post = isset($_POST['data']) ? $_POST['data'] : [];
$post = $this->grav['uri']->post();
$post = isset($post['data']) ? $post['data'] : [];
}
// Check to see if a data type is plugin-provided, before looking into core ones