From 36dfeb9a3612cd62d30bb11efb5af9afdb0c9483 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 9 Aug 2006 16:50:27 +0000 Subject: [PATCH] Cause ApplicationController to be reloaded git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4741 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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