Skip to content

Commit

Permalink
Fixing the fix, but not quite
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Jul 27, 2005
1 parent 3d2f000 commit 5b52b71
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions actionpack/lib/action_controller/rescue.rb
Expand Up @@ -24,13 +24,11 @@ def process_with_exception(request, response, exception)
protected
# Exception handler called when the performance of an action raises an exception.
def rescue_action(exception)
log_error(exception) unless logger.nil?
if performed?
erase_render_results
erase_redirect_results
end
log_error(exception) if logger
erase_results if perfomed?

if consider_all_requests_local || local_request?
@template.send(:assign_variables_from_controller)
rescue_action_locally(exception)
else
rescue_action_in_public(exception)
Expand Down

0 comments on commit 5b52b71

Please sign in to comment.