Just change the formats on first render, closes rails#5307, closes ra…

…ils#5308.
pinetops · Mar 7, 2012 · bcea8cd · bcea8cd
1 parent 74fe7e1
commit bcea8cd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -8,8 +8,13 @@ def render(context, options)
       @details = extract_details(options)
       extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
-      @lookup_context.rendered_format ||= template.formats.first
-      @lookup_context.formats = template.formats
+      context  = @lookup_context
+
+      unless context.rendered_format
+        context.rendered_format = template.formats.first
+        context.formats = template.formats
+      end
+
       render_template(template, options[:layout], options[:locals])
     end