diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-10 22:00:55 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-10 22:00:55 +0200 |
| commit | 63560660062d552d6bbebec007154f0c639bf865 (patch) | |
| tree | 0ff7ee5c1a63815685e9640ca4a9ceafb7732178 /actionpack/lib/action_controller/caching | |
| parent | 59e89facc2264322bcab59c9a8622380b62d4d40 (diff) | |
| parent | 61fc7a455099f179de88967f403f2038b9d3c821 (diff) | |
| download | rails-63560660062d552d6bbebec007154f0c639bf865.tar.gz rails-63560660062d552d6bbebec007154f0c639bf865.tar.bz2 rails-63560660062d552d6bbebec007154f0c639bf865.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -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) |