Sets _format attribute only if it wasn't set previously by the user

symfony · Mar 11, 2012 · aa53b88 · aa53b88
1 parent 0d89f13
commit aa53b88
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -133,7 +133,11 @@ public function render($controller, array $options = array())
             }
         } else {
             $options['attributes']['_controller'] = $controller;
-            $options['attributes']['_format'] = $request->getRequestFormat();
+
+            if (!isset($options['attributes']['_format'])) {
+                $options['attributes']['_format'] = $request->getRequestFormat();
+            }
+
             $options['attributes']['_route'] = '_internal';
             $subRequest = $request->duplicate($options['query'], null, $options['attributes']);
         }