diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] partially reverted previous merge

Browse Source
This commit is contained in:
Fabien Potencier 2011-06-13 17:00:18 +02:00
parent 459678a0e9
commit 33baf9d8ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
View File

@ -75,14 +75,14 @@ class ExceptionController extends ContainerAware
// when not in debug, try to find a template for the specific HTTP status code and format // when not in debug, try to find a template for the specific HTTP status code and format
if (!$debug) { if (!$debug) {
$template = sprintf('FrameworkBundle:Exception:%s%s.%s.twig', $name, $code, $format); $template = new TemplateReference('FrameworkBundle', 'Exception', $name.$code, $format, 'twig');
if ($templating->exists($template)) { if ($templating->exists($template)) {
return $template; return $template;
} }
} }
// try to find a template for the given format // try to find a template for the given format
$template = sprintf('FrameworkBundle:Exception:%s.%s.twig', $name, $format); $template = new TemplateReference('FrameworkBundle', 'Exception', $name, $format, 'twig');
if ($templating->exists($template)) { if ($templating->exists($template)) {
return $template; return $template;
} }
@ -90,6 +90,6 @@ class ExceptionController extends ContainerAware
// default to a generic HTML exception // default to a generic HTML exception
$this->container->get('request')->setRequestFormat('html'); $this->container->get('request')->setRequestFormat('html');
return sprintf('FrameworkBundle:Exception:%s.html.twig', $name); return new TemplateReference('FrameworkBundle', 'Exception', $name, 'html', 'twig');
} }
} }