Permalink
Browse files

Fixing the fix, but not quite

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 3d2f000 commit 5b52b716b7527855a4ac42822e1fa67a2f5bab79 @dhh dhh committed Jul 27, 2005
Showing with 3 additions and 5 deletions.
  1. +3 −5 actionpack/lib/action_controller/rescue.rb
@@ -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)

0 comments on commit 5b52b71

Please sign in to comment.