Permalink
Browse files

Cause ApplicationController to be reloaded

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4741 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Aug 9, 2006
1 parent 9b20464 commit 36dfeb9a3612cd62d30bb11efb5af9afdb0c9483
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/dispatcher.rb
@@ -99,7 +99,7 @@ def prepare_application
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

0 comments on commit 36dfeb9

Please sign in to comment.