From bcea8cd6d62f73cebc88256f7f54430c16f1b89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 7 Mar 2012 14:55:06 +0100
Subject: Just change the formats on first render, closes #5307, closes #5308.
---
actionpack/lib/action_view/renderer/template_renderer.rb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index ddde990b72..36c1e6a9e4 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -8,8 +8,13 @@ module ActionView
@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
--
cgit v1.2.3