fix error pages (#1209)

2019-10-31 00:16:25 +01:00
parent f4fcfeba9d
commit 4331a7c9f4
5 changed files with 10 additions and 4 deletions
--- a/src/EventSubscriber/MenuBuilderSubscriber.php
+++ b/src/EventSubscriber/MenuBuilderSubscriber.php
@@ -71,7 +71,10 @@ class MenuBuilderSubscriber implements EventSubscriberInterface
            new MenuItemModel('system', 'menu.system', '')
        );

-        $this->eventDispatcher->dispatch($menuEvent);
+        // error pages don't have a user and will fail when is_granted() is called
+        if (null !== $event->getRequest()->getUser()) {
+            $this->eventDispatcher->dispatch($menuEvent);
+        }

        if ($menuEvent->getAdminMenu()->hasChildren()) {
            $event->addItem(new MenuItemModel('admin', 'menu.admin', ''));