diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-07-14 00:34:27 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-07-14 00:34:27 +0000 |
| commit | fe0c7f4f76e8efce0d71fe705ce04e93bae74944 (patch) | |
| tree | 1bc7dfd5fc0241ac7835249328885fe155010c32 /actionpack/lib/action_controller/rescue.rb | |
| parent | 2bd4ff11f83a44d3364e3e5ceaa17d1a10320687 (diff) | |
| download | rails-fe0c7f4f76e8efce0d71fe705ce04e93bae74944.tar.gz rails-fe0c7f4f76e8efce0d71fe705ce04e93bae74944.tar.bz2 rails-fe0c7f4f76e8efce0d71fe705ce04e93bae74944.zip | |
Fix rescue handling to erase both render and redirect results
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1827 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 376a7f1aec..071dd7daf1 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -25,7 +25,10 @@ module ActionController #:nodoc: # Exception handler called when the performance of an action raises an exception. def rescue_action(exception) log_error(exception) unless logger.nil? - erase_render_results if performed? + if performed? + erase_render_results + erase_redirect_results + end if consider_all_requests_local || local_request? rescue_action_locally(exception) |