aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-26 20:36:35 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-29 14:45:06 -0300
commitd0c9c93c4a3a7da27ab8d9f53811960309f8e18f (patch)
treea14c5ff56fc74a6d61385141c540f2664439863f /actionpack/lib/action_view
parente72374d0ff8b149bdbf8e14a703cbc2028df520c (diff)
downloadrails-d0c9c93c4a3a7da27ab8d9f53811960309f8e18f.tar.gz
rails-d0c9c93c4a3a7da27ab8d9f53811960309f8e18f.tar.bz2
rails-d0c9c93c4a3a7da27ab8d9f53811960309f8e18f.zip
Allow layout to access current object being rendered when using render partial + object
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/renderer/partial_renderer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 449cf08fd0..c7765732c7 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -304,7 +304,7 @@ module ActionView
object, as = @object, @variable
if !block && (layout = @options[:layout])
- layout = find_template(layout)
+ layout = find_template(layout, @locals.keys + [@variable])
end
object ||= locals[as]