diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
| commit | 8aaf3c1e553d18b40d9980951d496bffad56f37b (patch) | |
| tree | 2eddd2b50a5924420b30caa5c6d867f4870a71dc /activesupport/lib/active_support/callbacks.rb | |
| parent | 9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff) | |
| parent | 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff) | |
| download | rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2 rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index b531a094cf..418102352f 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -1,3 +1,4 @@ +require 'active_support/concern' require 'active_support/descendants_tracker' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/class/attribute' @@ -415,7 +416,7 @@ module ActiveSupport options = filters.last.is_a?(Hash) ? filters.pop : {} filters.unshift(block) if block - ([self] + ActiveSupport::DescendantsTracker.descendants(self)).each do |target| + ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target| chain = target.send("_#{name}_callbacks") yield target, chain.dup, type, filters, options target.__define_runner(name) |