diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-06 19:45:40 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-06 19:45:40 -0300 |
| commit | af375a5eb3aba149590be1636480e1c3976c124f (patch) | |
| tree | 250d682085fe30291a47ee38cf19e6ddca7b68f3 /actionpack/lib/action_controller/caching/actions.rb | |
| parent | f0945409d935cdd3cb783a728d68414e7ca02dfc (diff) | |
| download | rails-af375a5eb3aba149590be1636480e1c3976c124f.tar.gz rails-af375a5eb3aba149590be1636480e1c3976c124f.tar.bz2 rails-af375a5eb3aba149590be1636480e1c3976c124f.zip | |
Replace _action_view with view_context to reflect that it is public and that it does not need to be an ActionView instance
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 |