aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-07-08 01:34:22 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-07-08 01:34:22 +0000
commit7231bfb59c03e55dd33fbe082a15ef5a558f79ee (patch)
tree88fe040d557d11dcc1c70d1c114839a21359af90 /railties/lib
parentde5b7370ddb988fa4342c56b9c8e7857c420c0ac (diff)
downloadrails-7231bfb59c03e55dd33fbe082a15ef5a558f79ee.tar.gz
rails-7231bfb59c03e55dd33fbe082a15ef5a558f79ee.tar.bz2
rails-7231bfb59c03e55dd33fbe082a15ef5a558f79ee.zip
Dispatcher processes rescued actions with the same controller that processed the request. Closes #4625.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 6290be3774..f43dc9f4c8 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -39,7 +39,7 @@ class Dispatcher
end
rescue Object => exception
failsafe_response(output, '500 Internal Server Error', exception) do
- ActionController::Base.process_with_exception(request, response, exception).out(output)
+ ActionController.process_with_exception(request, response, exception).out(output)
end
ensure
# Do not give a failsafe response here.