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

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