From 33baf9d8adca979ae146e491d9876e6f3a272e66 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 13 Jun 2011 17:00:18 +0200
Subject: [PATCH] [FrameworkBundle] partially reverted previous merge

---
 .../FrameworkBundle/Controller/ExceptionController.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
index 7cd72cae6b..3603053438 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
@@ -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
         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;
         }
@@ -90,6 +90,6 @@ class ExceptionController extends ContainerAware
         // 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');
     }
 }