Skip to content
This repository
Browse code

Dispatcher processes rescued actions with the same controller that pr…

…ocessed the request. Closes #4625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 7231bfb59c03e55dd33fbe082a15ef5a558f79ee 1 parent de5b737
Jeremy Kemper jeremy authored

Showing 2 changed files with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 0  railties/CHANGELOG
  2. +1 1  railties/lib/dispatcher.rb
2  railties/CHANGELOG
... ... @@ -1,5 +1,7 @@
1 1 *SVN*
2 2
  3 +* Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net]
  4 +
3 5 * rails -d frontbase to create a new project with a frontbase database.yml. #4945 [mlaster@metavillage.com]
4 6
5 7 * Ensure the logger is initialized. #5629 [mike@clarkware.com]
2  railties/lib/dispatcher.rb
@@ -39,7 +39,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
39 39 end
40 40 rescue Object => exception
41 41 failsafe_response(output, '500 Internal Server Error', exception) do
42   - ActionController::Base.process_with_exception(request, response, exception).out(output)
  42 + ActionController.process_with_exception(request, response, exception).out(output)
43 43 end
44 44 ensure
45 45 # Do not give a failsafe response here.

0 comments on commit 7231bfb

Please sign in to comment.
Something went wrong with that request. Please try again.