Fix syntax error in dispatcher than wrecked failsafe responses. Closes #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7002 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 [mtitorenko]
+
 * Scaffolded validation errors set the appropriate HTTP status for XML responses.  #6946, #8622 [Manfred Stienstra, mmmultiworks]
 
 * Sexy migrations for the session_migration generator.  #8561 [Vladislav]

railties/lib/dispatcher.rb

@@ -40,8 +40,7 @@ class Dispatcher
       end
     rescue Exception => exception  # errors from CGI dispatch
       failsafe_response(cgi, 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