Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge [7006] to stable: fix precedence error in failsafe rescue. Refe…

…rences #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7007 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 5c6a0d57acd2c77a8ae307a8647d7fb1c59faaad 1 parent 74191ed
@jeremy jeremy authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  railties/lib/dispatcher.rb
View
2  railties/lib/dispatcher.rb
@@ -42,7 +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 ActionController::Base
+ controller ||= (ApplicationController rescue ActionController::Base)
controller.process_with_exception(request, response, exception).out(output)
end
ensure
Please sign in to comment.
Something went wrong with that request. Please try again.