aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-08-09 16:50:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-08-09 16:50:27 +0000
commit36dfeb9a3612cd62d30bb11efb5af9afdb0c9483 (patch)
treef559d34286c088045559cd7f8108471325323980 /railties
parent9b204641c002317d097261c753490cced3dec40c (diff)
downloadrails-36dfeb9a3612cd62d30bb11efb5af9afdb0c9483.tar.gz
rails-36dfeb9a3612cd62d30bb11efb5af9afdb0c9483.tar.bz2
rails-36dfeb9a3612cd62d30bb11efb5af9afdb0c9483.zip
Cause ApplicationController to be reloaded
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4741 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index b62a497207..2a882ae1b4 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -99,7 +99,7 @@ class Dispatcher
end
prepare_breakpoint
- require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
+ Dependencies.require_or_load('application.rb', "ApplicationController") unless Object.const_defined?(:ApplicationController)
ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord)
run_preparation_callbacks
end