merged branch bamarni/patch-1 (PR #7005)

fabpot · fabpot · commit 1c0f481ec169 · 2013-03-18T15:30:54.000+01:00
This PR was merged into the master branch. Commits ------- ed58e36 [HttpKernel] CLI - don't always display errors Discussion ---------- [HttpKernel] CLI - don't always display errors I had closed #6370 by mistake when cleaning up my branches. --------------------------------------------------------------------------- by sstok at 2013-02-13T15:13:16Z :+1:
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -105,7 +105,7 @@ public function init()
             ErrorHandler::register($this->errorReportingLevel);
             if ('cli' !== php_sapi_name()) {
                 ExceptionHandler::register();
-            } else {
+            } elseif (!ini_get('log_errors') || ini_get('error_log')) {
                 ini_set('display_errors', 1);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function init()`
`105`	`105`	`ErrorHandler::register($this->errorReportingLevel);`
`106`	`106`	`if ('cli' !== php_sapi_name()) {`
`107`	`107`	`ExceptionHandler::register();`
`108`		`- } else {`
	`108`	`+ } elseif (!ini_get('log_errors') \|\| ini_get('error_log')) {`
`109`	`109`	`ini_set('display_errors', 1);`
`110`	`110`	`}`
`111`	`111`	`}`