diff options
| author | Jeroen Jacobs <info@jeroenj.be> | 2011-06-21 12:34:00 +0200 |
|---|---|---|
| committer | Jeroen Jacobs <info@jeroenj.be> | 2011-06-21 12:34:00 +0200 |
| commit | 791127eee45ee53b3ee897c647eceff17056c3e8 (patch) | |
| tree | 390308c29e15d579180b62953248571588bd62e7 /actionpack/lib | |
| parent | 8a889dd45e088014c77f4cd799c9e5ddea0b54c6 (diff) | |
| download | rails-791127eee45ee53b3ee897c647eceff17056c3e8.tar.gz rails-791127eee45ee53b3ee897c647eceff17056c3e8.tar.bz2 rails-791127eee45ee53b3ee897c647eceff17056c3e8.zip | |
Fixes an issue where cache sweepers with only after filters would have no controller object
It would raise undefined method controller_name for nil
Diffstat (limited to 'actionpack/lib')
| -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 e9db0d97b6..938a6ae81c 100644 --- a/actionpack/lib/action_controller/caching/sweeping.rb +++ b/actionpack/lib/action_controller/caching/sweeping.rb @@ -61,6 +61,7 @@ module ActionController #:nodoc: end def after(controller) + self.controller = controller callback(:after) if controller.perform_caching # Clean up, so that the controller can be collected after this request self.controller = nil |