diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-04-29 19:47:21 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-04-29 19:47:21 -0300 |
| commit | b0bd4f45fa9180793e3c35590c8a887ddfe43553 (patch) | |
| tree | d1ab690267c5e4d9d04faca14d4695f163375086 /actionpack/lib/action_controller/caching | |
| parent | 19d2ff83db5232a816dee201800baf3924705b31 (diff) | |
| parent | db892ea77563dadb6fbbd242be78ff87321d0bd1 (diff) | |
| download | rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.tar.gz rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.tar.bz2 rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -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 |