diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-22 02:00:41 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-22 02:00:41 +0000 |
| commit | 3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c (patch) | |
| tree | 17e95ad0c09a124d7f073b4e3426111ea8d083aa | |
| parent | 44819b47179936492c093811ed0f625ce6e029a3 (diff) | |
| download | rails-3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c.tar.gz rails-3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c.tar.bz2 rails-3f3cbb51dc20ecf7bbfa8e4fc6eb205ebe4e4c5c.zip | |
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
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |