Simpler rescue_action condition

2026-01-27 23:38:11 -05:00 · 2008-05-10 10:58:30 -05:00
parent f2e4bf218f
commit cde6a259bf
1 changed files with 2 additions and 4 deletions
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -199,10 +199,8 @@ module ActionController #:nodoc:
    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)