diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-11 18:05:02 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-11 18:05:02 +0000 |
| commit | e4e275dde3b6ff1bcdc5f12631faa48585cb491f (patch) | |
| tree | 7274bbc2f8ce9c7d86fc2e255a7ef479e06327aa /railties/lib | |
| parent | b94f8e1d296c372e192cf0f4b9cc94dba9deff12 (diff) | |
| download | rails-e4e275dde3b6ff1bcdc5f12631faa48585cb491f.tar.gz rails-e4e275dde3b6ff1bcdc5f12631faa48585cb491f.tar.bz2 rails-e4e275dde3b6ff1bcdc5f12631faa48585cb491f.zip | |
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
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 |