0
@@ -1,7 +1,5 @@
0
 *Edge*
0
 
0
-* Run callbacks from object's metaclass [Josh Peek]
0
-
0
 * Add Array#in_groups which splits or iterates over the array in specified number of groups. #579. [Adrian Mugnolo] Example:
0
   
0
   a = (1..10).to_a

0
@@ -269,15 +269,7 @@ module ActiveSupport
0
     #   pass
0
     #   stop
0
     def run_callbacks(kind, options = {}, &block)
0
-      callback_chain_method = "#{kind}_callback_chain"
0
-
0
-      # Meta class inherits Class so we don't have to merge it in 1.9
0
-      if RUBY_VERSION >= '1.9'
0
-        metaclass.send(callback_chain_method).run(self, options, &block)
0
-      else
0
-        callbacks = self.class.send(callback_chain_method) | metaclass.send(callback_chain_method)
0
-        callbacks.run(self, options, &block)
0
-      end
0
+      self.class.send("#{kind}_callback_chain").run(self, options, &block)
0
     end
0
   end
0
 end

0
@@ -84,30 +84,6 @@ class CallbacksTest < Test::Unit::TestCase
0
   end
0
 end
0
 
0
-class MetaclassCallbacksTest < Test::Unit::TestCase
0
-  module ModuleWithCallbacks
0
-    def self.extended(object)
0
-      object.metaclass.before_save :raise_metaclass_callback_called
0
-    end
0
-
0
-    def module_callback_called?
0
-      @module_callback_called ||= false
0
-    end
0
-
0
-    def raise_metaclass_callback_called
0
-      @module_callback_called = true
0
-    end
0
-  end
0
-
0
-  def test_metaclass_callbacks
0
-    person = Person.new
0
-    person.extend(ModuleWithCallbacks)
0
-    assert !person.module_callback_called?
0
-    person.save
0
-    assert person.module_callback_called?
0
-  end
0
-end
0
-
0
 class ConditionalCallbackTest < Test::Unit::TestCase
0
   def test_save_conditional_person
0
     person = ConditionalPerson.new