0
@@ -148,15 +148,14 @@ module ActiveRecord
0
         end
0
 
0
       private
0
-        def create_record(attributes)
0
+        def create_record(attributes, &block)
0
           # Can't use Base.create because the foreign key may be a protected attribute.
0
           ensure_owner_is_not_new
0
           if attributes.is_a?(Array)
0
             attributes.collect { |attr| create(attr) }
0
           else
0
-            record = build(attributes)
0
-            yield(record)
0
-            record
0
+            load_target
0
+            build_record(attributes, &block)
0
           end
0
         end
0
     end

0
@@ -94,6 +94,21 @@ class AssociationCallbacksTest < ActiveRecord::TestCase
0
                   "after_adding#{david.id}"], ar.developers_log
0
   end
0
 
0
+  def test_has_and_belongs_to_many_after_add_called_after_save
0
+    ar = projects(:active_record)
0
+    assert ar.developers_log.empty?
0
+    alice = Developer.new(:name => 'alice')
0
+    ar.developers_with_callbacks << alice
0
+    assert_equal"after_adding#{alice.id}", ar.developers_log.last
0
+
0
+    bob = ar.developers_with_callbacks.create(:name => 'bob')
0
+    assert_equal "after_adding#{bob.id}", ar.developers_log.last
0
+
0
+    ar.developers_with_callbacks.build(:name => 'charlie')
0
+    assert_equal "after_adding<new>", ar.developers_log.last
0
+  end
0
+
0
+
0
   def test_has_and_belongs_to_many_remove_callback
0
     david = developers(:david)
0
     jamis = developers(:jamis)