Permalink
Browse files

The dispatcher should reload the associations AFTER clearing the inhe…

…ritable 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
  • Loading branch information...
1 parent 44819b4 commit 3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c @dhh dhh committed Dec 22, 2004
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/dispatcher.rb
View
2 railties/lib/dispatcher.rb
@@ -43,8 +43,8 @@ def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest:
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)

0 comments on commit 3f3cbb5

Please sign in to comment.