From 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 8 Aug 2006 21:21:04 +0000 Subject: New dependencies implementation git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 4 ++-- activerecord/lib/active_record/observer.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 5e9d18e5d4..d1d10b41b4 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -264,7 +264,7 @@ module ActiveRecord #:nodoc: # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+. cattr_accessor :logger - include Reloadable::Subclasses + include Reloadable::Deprecated def self.inherited(child) #:nodoc: @@subclasses[self] ||= [] @@ -279,7 +279,7 @@ module ActiveRecord #:nodoc: def self.reset_subclasses #:nodoc: nonreloadables = [] subclasses.each do |klass| - unless klass.reloadable? + unless Dependencies.autoloaded? klass nonreloadables << klass next end diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb index 262f12d91e..e8ab95642f 100644 --- a/activerecord/lib/active_record/observer.rb +++ b/activerecord/lib/active_record/observer.rb @@ -129,7 +129,7 @@ module ActiveRecord # Observer subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::Subclasses + include Reloadable::Deprecated class << self # Attaches the observer to the supplied model classes. -- cgit v1.2.3