aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorJose Fernandez <joseferper@gmail.com>2010-02-23 18:50:05 +0100
committerwycats <wycats@gmail.com>2010-03-05 08:52:10 -0800
commita04b44910e57387bd1bcfbd95c3a6754a08e77af (patch)
tree4bc3eac717d6ed84db64b78bed044a5ddc3222a5 /actionpack/lib/action_view
parent8da026cb797519deac807721096fab5182ca61af (diff)
downloadrails-a04b44910e57387bd1bcfbd95c3a6754a08e77af.tar.gz
rails-a04b44910e57387bd1bcfbd95c3a6754a08e77af.tar.bz2
rails-a04b44910e57387bd1bcfbd95c3a6754a08e77af.zip
Solved a problem that prevented render :file => work in layouts
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/render/rendering.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 64cc0caf11..28b79bfcb7 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -102,7 +102,7 @@ module ActionView
ActiveSupport::Notifications.instrument("action_view.render_template",
:identifier => template.identifier, :layout => layout.try(:identifier)) do
- content = template.render(self, locals)
+ content = template.render(self, locals) {|*name| _layout_for(*name) }
@_content_for[:layout] = content
if layout