symfony
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt
Lines changed: 0 additions & 47 deletions b/‎src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt
Lines changed: 0 additions & 47 deletions
@@ -147,13 +147,10 @@ public static function register($handler = null, $replace = true)
             $handler = $prev[0];
             $replace = false;
         }
-        if (!$replace && $prev) {
-            restore_error_handler();
-        }
-        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) {
-            restore_exception_handler();
+        if ($replace || !$prev) {
+            $handler->setExceptionHandler(set_exception_handler(array($handler, 'handleException')));
         } else {
-            $handler->setExceptionHandler($prev);
+            restore_error_handler();
         }
 
         $handler->
52FF
throwAt($levels & $handler->thrownErrors, true);