diff options
| author | Aditya Chadha <aditya@sublucid.com> | 2009-05-02 18:32:45 -0400 |
|---|---|---|
| committer | Aditya Chadha <aditya@sublucid.com> | 2009-05-02 18:32:45 -0400 |
| commit | 7a17ad3f2b89baea94450af8e63a640ace570938 (patch) | |
| tree | 89cd60c05d4a812b3c8636373a05689b1df5bf75 /actionpack/lib/action_controller/caching/actions.rb | |
| parent | 5469a0be1a517a0c2d8ee553b704df4e6f7df306 (diff) | |
| parent | 1b32f882091ed7744654f74238f3f3b1ba6701ae (diff) | |
| download | rails-7a17ad3f2b89baea94450af8e63a640ace570938.tar.gz rails-7a17ad3f2b89baea94450af8e63a640ace570938.tar.bz2 rails-7a17ad3f2b89baea94450af8e63a640ace570938.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 2 |
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 b99feddf77..d95a346862 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('@cached_content_for_layout') + controller.template.layout && controller.template.instance_variable_get('@cached_content_for_layout') end end |