aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-08-31 15:23:13 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-08-31 15:23:45 +0100
commita13d335461c6b177f0365ad07625c15f10ace271 (patch)
tree5a272d8633fca365a171a04b6366d701437a57a1 /actionpack/lib/action_controller/caching
parentc50223b76fdb843dc7e4d4522627a5b20f955a03 (diff)
downloadrails-a13d335461c6b177f0365ad07625c15f10ace271.tar.gz
rails-a13d335461c6b177f0365ad07625c15f10ace271.tar.bz2
rails-a13d335461c6b177f0365ad07625c15f10ace271.zip
Move layout rendering logic to ActionView::Base
Diffstat (limited to 'actionpack/lib/action_controller/caching')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index f3535f8330..3d32519abd 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -121,7 +121,7 @@ module ActionController #:nodoc:
end
def content_for_layout(controller)
- controller.response.layout && controller.response.template.instance_variable_get('@content_for_layout')
+ controller.response.layout && controller.response.template.instance_variable_get('@cached_content_for_layout')
end
end