aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-20 13:21:01 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-20 13:21:01 +0000
commit8537d5eb93dae418c5c866b313ca1362990957ca (patch)
treedb6f7bce54f3e3ab370f665e9d950d5f8f088e4e /railties/lib
parentef489ca2ad9f3dd65563803a95d99cc53b2a5a0a (diff)
downloadrails-8537d5eb93dae418c5c866b313ca1362990957ca.tar.gz
rails-8537d5eb93dae418c5c866b313ca1362990957ca.tar.bz2
rails-8537d5eb93dae418c5c866b313ca1362990957ca.zip
Added a require_association hook on const_missing that makes it possible to use any model class without requiring it first. Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@233 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-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 e3fd36d89a..0fcd295094 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -43,7 +43,7 @@ class Dispatcher
if ActionController::Base.reload_dependencies
Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController)
Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
- ActiveRecord::Base.reset_associations_loaded
+ ActiveRecord::Base.reload_associations_loaded
ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
end