Permalink
Browse files

Merge [7002] to stable: fix syntax error in dispatcher than wrecked f…

…ailsafe responses. References #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7003 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9c0e4de commit 74191edb22d69902efff5bde3eb7cdf5544bc3e6 @jeremy jeremy committed Jun 11, 2007
Showing with 3 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +1 −2 railties/lib/dispatcher.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fix syntax error in dispatcher than wrecked failsafe responses. #8625 [mtitorenko]
+
* Add Active Resource to rails:freeze:edge and drop Action Web Service. #8205 [underbluewaters, Jeremy Kemper]
* Give generate scaffold a more descriptive database message. Closes #7316 [jeremymcanally]
@@ -42,8 +42,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
end
rescue Exception => exception # errors from CGI dispatch
failsafe_response(output, '500 Internal Server Error', exception) do
- controller ||= ApplicationController rescue LoadError nil
- controller ||= ActionController::Base
+ controller ||= ApplicationController rescue ActionController::Base
controller.process_with_exception(request, response, exception).out(output)
end
ensure

0 comments on commit 74191ed

Please sign in to comment.