diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-21 18:51:08 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-21 18:51:08 +0000 |
| commit | dab360e18129c8f4916b78d00d49ed9dda5ccd8a (patch) | |
| tree | 89b595695571614b5104517b262cbef45839acc3 /actionpack/lib/action_controller/rescue.rb | |
| parent | 3022ee84ccb4d006f4b27e34b7fcf700aad660c8 (diff) | |
| download | rails-dab360e18129c8f4916b78d00d49ed9dda5ccd8a.tar.gz rails-dab360e18129c8f4916b78d00d49ed9dda5ccd8a.tar.bz2 rails-dab360e18129c8f4916b78d00d49ed9dda5ccd8a.zip | |
Added DoubleRenderError exception that'll be raised if render* is called twice #518 [Nicholas Seckar]. Fixed exceptions occuring after render has been called #1096 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1348 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 2ee320a304..376a7f1aec 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -25,6 +25,7 @@ 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 consider_all_requests_local || local_request? rescue_action_locally(exception) |