bug #12196 [TwigBundle] show correct fallback exception template in debug mode (Tobion)

fabpot · fabpot · commit b409b4b473b2 · 2014-10-10T18:48:12.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [TwigBundle] show correct fallback exception template in debug mode | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - In debug mode, the exception controller did not show the correct template in case the format is unknown. It falls back to html but the logic for `exception_full` was not applied there. So it was just returning the partial html. Commits ------- b97acd9 [TwigBundle] show correct fallback exception template in debug mode
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -114,7 +114,7 @@ protected function findTemplate(Request $request, $format, $code, $debug)
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');
+        return new TemplateReference('TwigBundle', 'Exception', $debug ? 'exception_full' : $name, 'html', 'twig');
     }
 
     // to be removed when the minimum required version of Twig is >= 2.0

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ protected function findTemplate(Request $request, $format, $code, $debug)`
`114`	`114`	`// default to a generic HTML exception`
`115`	`115`	`$request->setRequestFormat('html');`
`116`	`116`
`117`		`- return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');`
	`117`	`+ return new TemplateReference('TwigBundle', 'Exception', $debug ? 'exception_full' : $name, 'html', 'twig');`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// to be removed when the minimum required version of Twig is >= 2.0`