diff options
| author | wycats <wycats@gmail.com> | 2010-06-08 18:10:27 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-08 18:10:27 -0400 |
| commit | df40dbe6f13c6799e972b20dcc1fbf11f0a02c61 (patch) | |
| tree | d3daec753c2e55c859c63053d8411306bb11d603 /actionpack/lib/action_controller | |
| parent | 6ebc7c8ee6de0f3f441a68baa6351416a6ac0a59 (diff) | |
| parent | 5c9f27abaabba0d008ccd710ed1af5f6caa4e371 (diff) | |
| download | rails-df40dbe6f13c6799e972b20dcc1fbf11f0a02c61.tar.gz rails-df40dbe6f13c6799e972b20dcc1fbf11f0a02c61.tar.bz2 rails-df40dbe6f13c6799e972b20dcc1fbf11f0a02c61.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching/sweeping.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb index cf16417e84..e9db0d97b6 100644 --- a/actionpack/lib/action_controller/caching/sweeping.rb +++ b/actionpack/lib/action_controller/caching/sweeping.rb @@ -57,6 +57,7 @@ module ActionController #:nodoc: def before(controller) self.controller = controller callback(:before) if controller.perform_caching + true # before method from sweeper should always return true end def after(controller) |