From 8eea11cc26101fb0db9a11d926a3ead788cfb0d0 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Mon, 23 Sep 2019 12:09:58 -0400 Subject: [PATCH] Show fallback error page when framework.error_controller is null --- src/Symfony/Component/ErrorHandler/ErrorHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index 11607aeafb..f81700b5ad 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -603,7 +603,7 @@ class ErrorHandler $handlerException = $handlerException ?: $exception; } catch (\Throwable $handlerException) { } - if ($exception === $handlerException) { + if ($exception === $handlerException && null === $this->exceptionHandler) { self::$reservedMemory = null; // Disable the fatal error handler throw $exception; // Give back $exception to the native handler } @@ -706,7 +706,7 @@ class ErrorHandler $exception = FlattenException::createFromThrowable($exception); $statusCode = $exception->getStatusCode(); $headers = $exception->getHeaders(); - $response = (new HtmlErrorRenderer(true))->render($exception); + $response = (new HtmlErrorRenderer(0 !== $this->scopedErrors))->render($exception); } else { $message = htmlspecialchars($exception->getMessage(), ENT_COMPAT | ENT_SUBSTITUTE, $charset); $response = sprintf('%s', $charset, $message);