Browse files

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...
1 parent de5b737 commit 7231bfb59c03e55dd33fbe082a15ef5a558f79ee @jeremy jeremy committed Jul 8, 2006
Showing with 3 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +1 −1 railties/lib/dispatcher.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net]
+
* rails -d frontbase to create a new project with a frontbase database.yml. #4945 [mlaster@metavillage.com]
* Ensure the logger is initialized. #5629 [mike@clarkware.com]
View
2 railties/lib/dispatcher.rb
@@ -39,7 +39,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
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.

0 comments on commit 7231bfb

Please sign in to comment.