Merge pull request #1643 from bolt/fix/errorcontroller

Fix Errorcontroller adding Exception when it shouldn't.
bolt · Jul 21, 2020 · 1a62b74 · 1a62b74
2 parents c24a596 + 7ac77e4
commit 1a62b74
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Controller/ErrorController.php b/src/Controller/ErrorController.php
@@ -48,7 +48,11 @@ public function showAction(Environment $twig, \Throwable $exception): Response
             $code = Response::HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        $twig->addGlobal('exception', $exception);
+        try {
+            $twig->addGlobal('exception', $exception);
+        } catch (\LogicException $e) {
+            // Fine! We'll just _not_ add the exception to the global scope!
+        }
 
         if ($code === Response::HTTP_SERVICE_UNAVAILABLE || $this->isMaintenanceEnabled($code)) {
             $twig->addGlobal('exception', $exception);