diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
| commit | dac8927b0576bff89ba3a4fcbf502dffc9b39e89 (patch) | |
| tree | 58c25132a52ef5cc56f406f8e2df416c5f2776a6 /actionpack/lib/action_controller/caching/actions.rb | |
| parent | 072c87b532a0bfb334787928248863a2561dc849 (diff) | |
| parent | 606e950ccbd02a10f724c73543575a2a4e1ed8cb (diff) | |
| download | rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.gz rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.bz2 rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.zip | |
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index d8a1662acc..cb0c3a1384 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -129,8 +129,7 @@ module ActionController #:nodoc: end def content_for_layout(controller) - # TODO: Remove this when new base is merged in - template = controller.respond_to?(:template) ? controller.template : controller._action_view + template = controller.view_context template.layout && template.instance_variable_get('@cached_content_for_layout') end end |