diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | 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 |