diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index 79d7d66dcc..88ef3d7615 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -234,9 +234,6 @@ EOF; img { border: 0; } #sf-resetcontent { width:970px; margin:0 auto; } $css - .xdebug-error { - display: none; - } diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 046d0c8a6a..a34ddbb6d0 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -95,17 +95,18 @@ abstract class Kernel implements KernelInterface, TerminableInterface public function init() { + ini_set('display_errors', 0); + if ($this->debug) { - ini_set('display_errors', 1); error_reporting(-1); DebugClassLoader::enable(); ErrorHandler::register($this->errorReportingLevel); if ('cli' !== php_sapi_name()) { ExceptionHandler::register(); + } else { + ini_set('display_errors', 1); } - } else { - ini_set('display_errors', 0); } }