From 3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 22 Dec 2004 02:00:41 +0000 Subject: The dispatcher should reload the associations AFTER clearing the inheritable variables, not before, or callbacks and others wont work git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@243 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 0fcd295094..e539ab5af8 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -43,8 +43,8 @@ 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.reload_associations_loaded ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses + ActiveRecord::Base.reload_associations_loaded end Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT) -- cgit v1.2.3