From d8a72b32c5b0c32abf257f05b89bad7d21f178ec Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 16 Jul 2008 20:23:44 -0500 Subject: Revert "Run callbacks from object's metaclass" --- activesupport/lib/active_support/callbacks.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index f125a56246..9c59b7ac76 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -269,15 +269,7 @@ module ActiveSupport # pass # stop def run_callbacks(kind, 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 + self.class.send("#{kind}_callback_chain").run(self, options, &block) end end end -- cgit v1.2.3