diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-07-08 10:09:39 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-07-08 10:09:39 -0400 |
| commit | 4a1207d54077348b67fad95ffde5710cf0be31bd (patch) | |
| tree | de721528fa81f1dfe50449c2d5c3985f513e83cd /activerecord/lib/active_record/observer.rb | |
| parent | f6fa6cf6117e691899c821b8999bd7dfb3f48b38 (diff) | |
| parent | dc364fdc595405aa3d5735e60d46ad3f9544a65b (diff) | |
| download | rails-4a1207d54077348b67fad95ffde5710cf0be31bd.tar.gz rails-4a1207d54077348b67fad95ffde5710cf0be31bd.tar.bz2 rails-4a1207d54077348b67fad95ffde5710cf0be31bd.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/observer.rb')
| -rw-r--r-- | activerecord/lib/active_record/observer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb index 5f80bd86df..d2ed643f35 100644 --- a/activerecord/lib/active_record/observer.rb +++ b/activerecord/lib/active_record/observer.rb @@ -94,7 +94,7 @@ module ActiveRecord def initialize super - observed_subclasses.each { |klass| add_observer!(klass) } + observed_descendants.each { |klass| add_observer!(klass) } end def self.method_added(method) @@ -108,8 +108,8 @@ module ActiveRecord protected - def observed_subclasses - observed_classes.sum([]) { |klass| klass.send(:descendants) } + def observed_descendants + observed_classes.sum([]) { |klass| klass.descendants } end def observe_callbacks? |