diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-11-07 19:52:27 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-11-07 19:52:27 +0000 |
| commit | e51112c15d1a4b21bef81b48ea6be463e8e3c17c (patch) | |
| tree | 118b3078ddbcc9777ab3c3c06406418a253c94c8 /railties | |
| parent | 57a3e44052676db61a11f4f0052a8d837cddecce (diff) | |
| download | rails-e51112c15d1a4b21bef81b48ea6be463e8e3c17c.tar.gz rails-e51112c15d1a4b21bef81b48ea6be463e8e3c17c.tar.bz2 rails-e51112c15d1a4b21bef81b48ea6be463e8e3c17c.zip | |
Remove temporary crutch to help ApplicationController be unloaded. Closes #6496.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 08afe5dacd..bafc8c28b2 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -101,7 +101,7 @@ class Dispatcher end prepare_breakpoint - Dependencies.require_or_load('application.rb', "ApplicationController") unless Object.const_defined?(:ApplicationController) + Dependencies.require_or_load('application') unless Object.const_defined?(:ApplicationController) ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord) run_preparation_callbacks end |