Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-04 20:36:03 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

Browse Source 
# Conflicts:
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/scss/template/_editor.scss
#	themes/grav/scss/template/_forms.scss
#	themes/grav/scss/template/_remodal.scss
#	themes/grav/templates/partials/base.html.twig
#	themes/grav/templates/partials/dashboard-statistics.html.twig
This commit is contained in:
Djamil Legato
2016-03-02 11:13:06 -08:00
parent 1465f1a7e6 a6bfd6f81e
commit f5e1ea01f2
89 changed files with 15841 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
classes/controller.php
View File

@@ -1189,6 +1189,9 @@ class AdminController
$route = !isset($data['route']) ? dirname($this->admin->route) : $data['route'];
$obj = $this->admin->page(true);
// Ensure route is prefixed with a forward slash.
$route = '/' . ltrim($route, '/');
if (isset($data['frontmatter']) && !$this->checkValidFrontmatter($data['frontmatter'])) {
$this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.INVALID_FRONTMATTER_COULD_NOT_SAVE'), 'error');
return false;