aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-03-02 12:46:24 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-02 12:50:36 -0200
commit1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1 (patch)
tree0a98c16f9310b42b14d7633334d3148bec220b74 /actionpack/lib/action_view
parentbbe7dac2230c6c9410fda59f6b259d3e53ea437e (diff)
downloadrails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.tar.gz
rails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.tar.bz2
rails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.zip
Fix #5238, rendered_format is not set when template is not rendered
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/renderer/partial_renderer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 374bdb62f5..17aa85555c 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -273,6 +273,8 @@ module ActionView
@block = block
@details = extract_details(options)
+ @lookup_context.rendered_format ||= formats.first
+
if String === partial
@object = options[:object]
@path = partial