aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderer
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:46:50 -0200
commitaeeebe1fdca56d20a9950f5585d10f8089388278 (patch)
treea803090b35d00044c70026aa72749d4672447160 /actionpack/lib/action_view/renderer
parent974a9dbaa307a1b2ed79633366270aeeac778cd4 (diff)
downloadrails-aeeebe1fdca56d20a9950f5585d10f8089388278.tar.gz
rails-aeeebe1fdca56d20a9950f5585d10f8089388278.tar.bz2
rails-aeeebe1fdca56d20a9950f5585d10f8089388278.zip
Fix #5238, rendered_format is not set when template is not rendered
Diffstat (limited to 'actionpack/lib/action_view/renderer')
-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 3033294883..3628b935b7 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -272,6 +272,8 @@ module ActionView
@block = block
@details = extract_details(options)
+ @lookup_context.rendered_format ||= formats.first
+
if String === partial
@object = options[:object]
@path = partial