diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-10 10:58:30 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-12 13:24:32 -0700 |
| commit | cde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046 (patch) | |
| tree | fc62831dc4c084c816ace05d2ddd28b811de0f79 /actionpack | |
| parent | f2e4bf218f95ab279e1a1527c37115faf65ac283 (diff) | |
| download | rails-cde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046.tar.gz rails-cde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046.tar.bz2 rails-cde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046.zip | |
Simpler rescue_action condition
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 5022c9a815..40ef4ea044 100644 --- 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) |