diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-23 22:53:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-23 22:53:26 +0100 |
| commit | f915f9e33903ee474920e24ad12a1625f2ef1c52 (patch) | |
| tree | 5b6d41e8a809aeaadbc2c0be59603f5f58b16231 /actionpack/lib/action_view/helpers/cache_helper.rb | |
| parent | b17e358e3df34c03019e357f693611618092e1d6 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.gz rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.bz2 rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.zip | |
Merge branch 'master' into app
Conflicts:
railties/lib/rails/application.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers/cache_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/cache_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb index 64d1ad2715..d5cc14b29a 100644 --- a/actionpack/lib/action_view/helpers/cache_helper.rb +++ b/actionpack/lib/action_view/helpers/cache_helper.rb @@ -32,7 +32,7 @@ module ActionView # <i>Topics listed alphabetically</i> # <% end %> def cache(name = {}, options = nil, &block) - @controller.fragment_for(output_buffer, name, options, &block) + controller.fragment_for(output_buffer, name, options, &block) end end end |