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

fabpot · fabpot · commit 1284714cb5e0 · 2013-05-01T19:20:17.000+02:00
This PR was merged into the master branch. Discussion ---------- [Debug] tweak for #6474 This keeps the previous behavior as described in the comment. Commits ------- 7d67b5b [Debug] tweak for #6474
diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
@@ -46,7 +46,8 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
         ErrorHandler::register($errorReportingLevel, $displayErrors);
         if ('cli' !== php_sapi_name()) {
             ExceptionHandler::register();
-        } elseif (!ini_get('log_errors') || ini_get('error_log') && $displayErrors) {
+        // CLI - display errors only if they're not already logged to STDERR
+        } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
             ini_set('display_errors', 1);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ public static function enable($errorReportingLevel = null, $displayErrors = true`
`46`	`46`	`ErrorHandler::register($errorReportingLevel, $displayErrors);`
`47`	`47`	`if ('cli' !== php_sapi_name()) {`
`48`	`48`	`ExceptionHandler::register();`
`49`		`- } elseif (!ini_get('log_errors') \|\| ini_get('error_log') && $displayErrors) {`
	`49`	`+ // CLI - display errors only if they're not already logged to STDERR`
	`50`	`+ } elseif ($displayErrors && (!ini_get('log_errors') \|\| ini_get('error_log'))) {`
`50`	`51`	`ini_set('display_errors', 1);`
`51`	`52`	`}`
`52`	`53`