diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-24 19:56:11 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-24 19:56:11 +0000 |
| commit | dfcb5af2dcf2300b84f60f5de42561d20694f8b5 (patch) | |
| tree | 71cea505e039d5b2dbef6b1dfcfa2fc044f4515d /actionpack/lib/action_controller/rescue.rb | |
| parent | 40f9fd39f6b471cb35b551b456f2c22d52f1b825 (diff) | |
| download | rails-dfcb5af2dcf2300b84f60f5de42561d20694f8b5.tar.gz rails-dfcb5af2dcf2300b84f60f5de42561d20694f8b5.tar.bz2 rails-dfcb5af2dcf2300b84f60f5de42561d20694f8b5.zip | |
Move rescue_action_with_handler from rescue_action to perform_action so it isn't clobbered by test overrides. References #9449, closes #9645.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index a34356f172..379bc76281 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -89,8 +89,6 @@ module ActionController #:nodoc: log_error(exception) if logger erase_results if performed? - return if rescue_action_with_handler(exception) - # Let the exception alter the response if it wants. # For example, MethodNotAllowed sets the Allow header. if exception.respond_to?(:handle_response!) @@ -176,6 +174,8 @@ module ActionController #:nodoc: def perform_action_with_rescue #:nodoc: perform_action_without_rescue rescue Exception => exception # errors from action performed + return if rescue_action_with_handler(exception) + rescue_action(exception) end |