diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
| commit | 20d850dac78fc11512a6ad9f3d2ad397daac3e87 (patch) | |
| tree | d982ec813560600d21edfe3ad1597d2c83af1df1 /actionpack/lib/action_controller/caching | |
| parent | 6932ae4b2978de6771e6d1c84cfc3595cf9d8bab (diff) | |
| parent | b3bc4fa5e02e71a992f8a432757548c762f0aad8 (diff) | |
| download | rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.gz rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.bz2 rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/sweeping.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb index c7992d7769..c1be264ffb 100644 --- a/actionpack/lib/action_controller/caching/sweeping.rb +++ b/actionpack/lib/action_controller/caching/sweeping.rb @@ -87,9 +87,9 @@ module ActionController #:nodoc: __send__(action_callback_method_name) if respond_to?(action_callback_method_name, true) end - def method_missing(method, *arguments) + def method_missing(method, *arguments, &block) return if @controller.nil? - @controller.__send__(method, *arguments) + @controller.__send__(method, *arguments, &block) end end end |