From 424a5a7d46176eaa9617ad4fdc99d8c2be53b186 Mon Sep 17 00:00:00 2001 From: Kassio Borges Date: Fri, 23 Aug 2013 22:46:49 -0300 Subject: fix issue #11605 --- actionpack/lib/action_view/renderer/template_renderer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_view/renderer/template_renderer.rb') diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index d15e75637a..a27d5dd1b1 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -10,10 +10,9 @@ module ActionView template = determine_template(options) context = @lookup_context - prepend_formats(template.formats) - unless context.rendered_format - context.rendered_format = template.formats.first || formats.last + context.formats = template.formats unless template.formats.empty? + context.rendered_format = context.formats.first end render_template(template, options[:layout], options[:locals]) -- cgit v1.2.3