diff options
| author | Stan Lo <a22301613@yahoo.com.tw> | 2016-01-06 15:29:22 +0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-23 21:06:41 -0300 |
| commit | 98fe07a946543a6f4d2d7dc9758f0145e1ab932e (patch) | |
| tree | dd66e6e1bab8ea6ac0343980854055606f772738 /actionpack | |
| parent | 1de6f7938dbc58a618a89397aad5f217a6221d17 (diff) | |
| download | rails-98fe07a946543a6f4d2d7dc9758f0145e1ab932e.tar.gz rails-98fe07a946543a6f4d2d7dc9758f0145e1ab932e.tar.bz2 rails-98fe07a946543a6f4d2d7dc9758f0145e1ab932e.zip | |
Move ActionMailer::Caching's content into ActionMailer::Base instead of including it
Remove useless helper in ActionDispatch::Caching and fix indentation
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/caching.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/caching.rb b/actionpack/lib/action_dispatch/caching.rb index ac4a35d1db..4e38098541 100644 --- a/actionpack/lib/action_dispatch/caching.rb +++ b/actionpack/lib/action_dispatch/caching.rb @@ -20,7 +20,6 @@ module ActionDispatch end end - include AbstractController::Helpers include ConfigMethods include ActionDispatch::Caching::Fragments @@ -50,12 +49,12 @@ module ActionDispatch protected # Convenience accessor. - def cache(key, options = {}, &block) - if cache_configured? - cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller), options, &block) - else - yield + def cache(key, options = {}, &block) + if cache_configured? + cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller), options, &block) + else + yield + end end - end end end |