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

Merge branch 'feature/fix-error-on-deleting-homepage' into develop

Browse Source
This commit is contained in:
Flavio Copes
2015-08-07 19:29:54 +02:00
parent c546cfa242 fe8446aa08
commit b8c197e4ed
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin.php
View File

@@ -152,7 +152,12 @@ class AdminPlugin extends Plugin
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.
$post = !empty($_POST) ? $_POST : array();
@@ -220,9 +225,13 @@ class AdminPlugin extends Plugin
$twig->twig_vars['popularity'] = $this->popularity;
break;
case 'pages':
$twig->twig_vars['file'] = File::instance($this->admin->page(true)->filePath());
$twig->twig_vars['media_types'] = str_replace('defaults,', '',
implode(',.', array_keys($this->config->get('media'))));
$page = $this->admin->page(true);
if ($page != null) {
$twig->twig_vars['file'] = File::instance($page->filePath());
$twig->twig_vars['media_types'] = str_replace('defaults,', '',
implode(',.', array_keys($this->config->get('media'))));
}
break;
}
}