diff options
| author | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
| commit | 74fd17346f30fddba0e174ae17f5697f2c22279e (patch) | |
| tree | 1267cea613ee4a73a2f5ddf3fb24d224dc8bbded /actionpack/lib/action_controller/rescue.rb | |
| parent | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (diff) | |
| parent | 4dedc7ddcaffa8c606af11ae2d32707131b99a2e (diff) | |
| download | rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.gz rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.bz2 rails-74fd17346f30fddba0e174ae17f5697f2c22279e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -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) |