3 files changed, 63 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 9d821d17e9..168719060d 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -46,6 +46,7 @@ require 'active_record/acts/tree'
 require 'active_record/acts/nested_set'
 require 'active_record/locking'
 require 'active_record/migration'
+require 'active_record/recursion'
 
 ActiveRecord::Base.class_eval do
   include ActiveRecord::Validations
@@ -59,6 +60,7 @@ ActiveRecord::Base.class_eval do
   include ActiveRecord::Acts::Tree
   include ActiveRecord::Acts::List
   include ActiveRecord::Acts::NestedSet
+  include ActiveRecord::Recursion # must go last!
 end
 
 require 'active_record/connection_adapters/mysql_adapter'
diff --git a/activerecord/lib/active_record/recursion.rb b/activerecord/lib/active_record/recursion.rb
new file mode 100644
index 0000000000..36589238e7
--- /dev/null
+++ b/activerecord/lib/active_record/recursion.rb
@@ -0,0 +1,60 @@
+module ActiveRecord
+  # Wraps a guard around #save to make sure that recursive calls don't actually
+  # invoke save multiple times. Recursive calls to save can occur quite
+  # easily, and unintentionally. Consider the following case:
+  #
+  #   class Project < ActiveRecord::Base
+  #     has_and_belongs_to_many :people
+  #     after_create :grant_access_to_admins
+  #
+  #     def grant_access_to_admins
+  #       Person.admins.each do |admin|
+  #         admin.projects.push_with_attributes(self, "access_level" => 42)
+  #       end
+  #     end
+  #   end
+  #
+  #   class Person < ActiveRecord::Base
+  #     has_and_belongs_to_many :projects
+  #     ...
+  #   end
+  #
+  #   teddy = Person.find_by_name("teddy")
+  #   project = Project.new :name => "sumo wrestling"
+  #   project.people << teddy
+  #   project.save!
+  #
+  # The #push_with_attributes causes +self+ (the project) to be saved again,
+  # even though we're already in the midst of doing a save. This results in
+  # "teddy" _not_ being added to the project's people list, because the
+  # recursive call resets the new-record status and thus ignores any
+  # non-new records in the collection.
+  #
+  # Thus, the need for a recursive guard on save.
+  module Recursion 
+    def self.append_features(base) # :nodoc:
+      super
+
+      base.class_eval do
+        alias_method :save_without_recursive_guard, :save
+        alias_method :save, :save_with_recursive_guard
+      end
+    end    
+
+    # Wrap the save call with a sentinel that prevents saves from occuring if
+    # a save is already in progress.
+    def save_with_recursive_guard(*args)
+      critical = Thread.critical
+      Thread.critical = true
+      old_save_state = @currently_saving_record
+      return true if @currently_saving_record
+      @currently_saving_record = true
+      Thread.critical = critical
+
+      save_without_recursive_guard(*args)
+    ensure
+      Thread.critical = critical
+      @currently_saving_record = old_save_state
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 3eedd0093c..d58502e98b 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -653,7 +653,7 @@ module ActiveRecord
     # Attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false
     # if the record is not valid.
     def save!
-      valid? ? save_without_validation : raise(RecordInvalid)
+      valid? ? save(false) : raise(RecordInvalid)
     end
 
     # Updates a single attribute and saves the record without going through the normal validation procedure.