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

Fix fatal error on deleting the homepage

Browse Source
This commit is contained in:
Flavio Copes
2015-08-07 12:05:34 +02:00
parent 79de53d310
commit fe8446aa08
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin.php
View File

@@ -148,7 +148,12 @@ class AdminPlugin extends Plugin
unset($this->grav['admin']->routes['/']); unset($this->grav['admin']->routes['/']);
} }
$pages->dispatch('/', true)->route($home); $page = $pages->dispatch('/', true);
// If page is null, the default page does not exist, and we cannot route to it
if ($page) {
$page->route($home);
}
// Make local copy of POST. // Make local copy of POST.
$post = !empty($_POST) ? $_POST : array(); $post = !empty($_POST) ? $_POST : array();
@@ -216,9 +221,13 @@ class AdminPlugin extends Plugin
$twig->twig_vars['popularity'] = $this->popularity; $twig->twig_vars['popularity'] = $this->popularity;
break; break;
case 'pages': case 'pages':
$twig->twig_vars['file'] = File::instance($this->admin->page(true)->filePath()); $page = $this->admin->page(true);
if ($page != null) {
$twig->twig_vars['file'] = File::instance($page->filePath());
$twig->twig_vars['media_types'] = str_replace('defaults,', '', $twig->twig_vars['media_types'] = str_replace('defaults,', '',
implode(',.', array_keys($this->config->get('media')))); implode(',.', array_keys($this->config->get('media'))));
}
break; break;
} }
} }

5
classes/admin.php
View File

@@ -486,6 +486,11 @@ class Admin
if (!$page) { if (!$page) {
$slug = basename($path); $slug = basename($path);
if ($slug == '') {
return null;
}
$ppath = dirname($path); $ppath = dirname($path);
// Find or create parent(s). // Find or create parent(s).