aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-27 13:55:39 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-27 13:55:39 +0000
commit5b52b716b7527855a4ac42822e1fa67a2f5bab79 (patch)
tree4a90c1c69baf5cf31d314fea13cc737973d0cb4f /actionpack
parent3d2f0001ea157d9951bdf6a7f6221a9ab4a80517 (diff)
downloadrails-5b52b716b7527855a4ac42822e1fa67a2f5bab79.tar.gz
rails-5b52b716b7527855a4ac42822e1fa67a2f5bab79.tar.bz2
rails-5b52b716b7527855a4ac42822e1fa67a2f5bab79.zip
Fixing the fix, but not quite
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/rescue.rb8
1 files changed, 3 insertions, 5 deletions
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)