[FrameworkBundle] partially reverted previous merge

symfony · Jun 13, 2011 · 33baf9d · 33baf9d
1 parent 459678a
commit 33baf9d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
@@ -75,21 +75,21 @@ protected function findTemplate($templating, $format, $code, $debug)
 
         // when not in debug, try to find a template for the specific HTTP status code and format
         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)) {
                 return $template;
             }
         }
 
         // 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)) {
             return $template;
         }
 
         // default to a generic HTML exception
         $this->container->get('request')->setRequestFormat('html');
 
-        return sprintf('FrameworkBundle:Exception:%s.html.twig', $name);
+        return new TemplateReference('FrameworkBundle', 'Exception', $name, 'html', 'twig');
     }
 }