From 314507c0d9c5e30b01ac43cee20806b446f21e43 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 27 Oct 2010 07:18:02 +0200
Subject: [PATCH] [FrameworkBundle] fixed format management when the default
 html format is given explicitly

---
 src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php
index 24559005d8..22eaaf6308 100755
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php
@@ -167,7 +167,9 @@ class Engine extends BaseEngine
         $elements = explode('.', $parts[2]);
         if (3 === count($elements)) {
             $parts[2] = $elements[0];
-            $options['format'] = '.'.$elements[1];
+            if ('html' !== $elements[1]) {
+                $options['format'] = '.'.$elements[1];
+            }
             $options['renderer'] = $elements[2];
         } elseif (2 === count($elements)) {
             $parts[2] = $elements[0];