From 7d67b5b2d4f68e7b161228386f7d94b2a9cdbfd5 Mon Sep 17 00:00:00 2001
From: Bilal Amarni <bilal.amarni@gmail.com>
Date: Wed, 1 May 2013 20:15:41 +0300
Subject: [PATCH] [Debug] tweak for #6474

---
 src/Symfony/Component/Debug/Debug.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
index 63f0b68221..2e36805ca3 100644
--- a/src/Symfony/Component/Debug/Debug.php
+++ b/src/Symfony/Component/Debug/Debug.php
@@ -46,7 +46,8 @@ class Debug
         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);
         }