diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-11-09 18:22:44 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-11-09 18:22:44 +0000 |
| commit | d3100ec85500b970f94819a749f071eeb74dc206 (patch) | |
| tree | f71bc1b4a136a7fd7a858dc7233d0313012bd06c | |
| parent | 089d3ec3186014ace8c80c989c87c33a6b21f582 (diff) | |
| download | rails-d3100ec85500b970f94819a749f071eeb74dc206.tar.gz rails-d3100ec85500b970f94819a749f071eeb74dc206.tar.bz2 rails-d3100ec85500b970f94819a749f071eeb74dc206.zip | |
Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ac05ec343c..31f1a927a1 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. [Nicholas Seckar] + * Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT. #6584 [jchris] * Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. [Nicholas Seckar] diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index bafc8c28b2..be2f54a04c 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') unless Object.const_defined?(:ApplicationController) + require_dependency 'application' unless Object.const_defined?(:ApplicationController) ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord) run_preparation_callbacks end |