diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/dispatcher.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |