From 5b52b716b7527855a4ac42822e1fa67a2f5bab79 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Jul 2005 13:55:39 +0000 Subject: Fixing the fix, but not quite git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/rescue.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index ae6127afba..b96f04a50b 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -24,13 +24,11 @@ module ActionController #:nodoc: 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) -- cgit v1.2.3