Merge branch '2.5' into 2.6

* 2.5: [Debug] fix error message on double exception Fix initialized() with aliased services Rename Symfony2 to Symfony compare version using PHP_VERSION_ID backport #12489 remove an unneeded check
Merge branch '2.3' into 2.5
2026-04-28 03:33:15 +02:00 · 2014-11-28 11:00:40 +01:00 · 2014-11-28 11:00:29 +01:00 · 2014-11-28 10:40:13 +01:00
1 changed files with 1 additions and 1 deletions
@@ -249,7 +249,7 @@ EOF
            } catch (\Exception $e) {
                // something nasty happened and we cannot throw an exception anymore
                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($exception), $exception->getMessage());
+                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage());
                } else {
                    $title = 'Whoops, looks like something went wrong.';
                }