github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-09 21:55:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar
2006-11-09 18:22:44 +00:00
parent 089d3ec318
commit d3100ec855
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@@ -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]

2
railties/lib/dispatcher.rb
View File

@@ -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