Permalink
Browse files

Simpler rescue_action condition

  • Loading branch information...
1 parent f2e4bf2 commit cde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046 @jeremy jeremy committed May 10, 2008
Showing with 2 additions and 4 deletions.
  1. +2 −4 actionpack/lib/action_controller/rescue.rb
View
6 actionpack/lib/action_controller/rescue.rb
@@ -199,10 +199,8 @@ def rescue_action_with_handler(exception)
private
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)
+ rescue Exception => exception
+ rescue_action_with_handler(exception) || rescue_action(exception)
end
def rescues_path(template_name)

0 comments on commit cde6a25

Please sign in to comment.