aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/callbacks.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
-rw-r--r--activesupport/lib/active_support/callbacks.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 9c59b7ac76..f125a56246 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -269,7 +269,15 @@ module ActiveSupport
# pass
# stop
def run_callbacks(kind, options = {}, &block)
- self.class.send("#{kind}_callback_chain").run(self, options, &block)
+ callback_chain_method = "#{kind}_callback_chain"
+
+ # Meta class inherits Class so we don't have to merge it in 1.9
+ if RUBY_VERSION >= '1.9'
+ metaclass.send(callback_chain_method).run(self, options, &block)
+ else
+ callbacks = self.class.send(callback_chain_method) | metaclass.send(callback_chain_method)
+ callbacks.run(self, options, &block)
+ end
end
end
end