diff --git a/admin.php b/admin.php index f973457b..50615262 100644 --- a/admin.php +++ b/admin.php @@ -792,11 +792,13 @@ class AdminPlugin extends Plugin { // Special case to redirect after changing the admin route to avoid 'breaking' $obj = $event['object']; - $blueprint = $obj->blueprints()->getFilename(); + if (!is_null($event['object'])) { + $blueprint = $obj->blueprints()->getFilename(); - if ($blueprint == 'admin/blueprints' && isset($obj->route) && $this->admin_route !== $obj->route) { - $redirect = preg_replace('/^' . str_replace('/','\/',$this->admin_route) . '/',$obj->route,$this->uri->path()); - $this->grav->redirect($redirect); + if ($blueprint == 'admin/blueprints' && isset($obj->route) && $this->admin_route !== $obj->route) { + $redirect = preg_replace('/^' . str_replace('/','\/',$this->admin_route) . '/',$obj->route,$this->uri->path()); + $this->grav->redirect($redirect); + } } }