diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-22 10:48:19 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-22 10:48:19 -0700 |
| commit | 6b3342d971d4e127dceb351ef983ca650167518e (patch) | |
| tree | 86f6de3f5be8e6aff4ff936003bc86b42a3e08d1 /actionpack/lib | |
| parent | a1f8421060461251c456c72ca22bb9b1006841dc (diff) | |
| parent | 93ff522120a916f49133d2f8539d904b46f8d539 (diff) | |
| download | rails-6b3342d971d4e127dceb351ef983ca650167518e.tar.gz rails-6b3342d971d4e127dceb351ef983ca650167518e.tar.bz2 rails-6b3342d971d4e127dceb351ef983ca650167518e.zip | |
Merge pull request #1798 from jeroenj/cachesweeper-fix
Fixes an issue where cache sweepers with only after filters would have no controller object
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 |