From e4e275dde3b6ff1bcdc5f12631faa48585cb491f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 11 Jun 2007 18:05:02 +0000 Subject: 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 | 2 ++ railties/lib/dispatcher.rb | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a88edd739d..99e8249b46 100644 --- a/railties/CHANGELOG +++ b/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] diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 1a6557b971..de6b554219 100644 --- a/railties/lib/dispatcher.rb +++ b/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 -- cgit v1.2.3