diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-27 17:31:48 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-27 17:31:48 -0700 |
| commit | f2f58f535520bfa77ab2d0ad1fb598f18349dd2e (patch) | |
| tree | 033f30d9fc685b9764afddf0b7ce9b4f7c04a6bb /activesupport/lib | |
| parent | 1e2628431a742e4f67af1d5dc1db8ad6393e8832 (diff) | |
| download | rails-f2f58f535520bfa77ab2d0ad1fb598f18349dd2e.tar.gz rails-f2f58f535520bfa77ab2d0ad1fb598f18349dd2e.tar.bz2 rails-f2f58f535520bfa77ab2d0ad1fb598f18349dd2e.zip | |
Fix failing ActionCacheFilter tests due to around filter changes.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/new_callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb index 185fb6a6af..f1d2ea7bb1 100644 --- a/activesupport/lib/active_support/new_callbacks.rb +++ b/activesupport/lib/active_support/new_callbacks.rb @@ -313,8 +313,8 @@ module ActiveSupport #{method_name}_object.send("filter", self, &blk) # TODO: Deprecate this elsif #{method_name}_object.respond_to?(:before) && #{method_name}_object.respond_to?(:after) - #{method_name}_object.before(self) - yield + should_continue = #{method_name}_object.before(self) + yield if should_continue #{method_name}_object.after(self) else #{method_name}_object.send("#{kind}_#{name}", self, &blk) |