0
@@ -272,8 +272,8 @@ module ActiveRecord #:nodoc:
0
 
0
         # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
0
         def save_version
0
-          if @is_new_record || save_version?
0
-            @is_new_record = nil
0
+          if @saving_version
0
+            @saving_version = nil
0
             rev = self.class.versioned_class.new
0
             clone_versioned_model(self, rev)
0
             rev.version = send(self.class.version_column)
0
@@ -386,7 +386,7 @@ module ActiveRecord #:nodoc:
0
         protected
0
           # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
0
           def set_new_version
0
-            @is_new_record = new_record?
0
+            @saving_version = new_record? || save_version?
0
             self.send("#{self.class.version_column}=", next_version) if new_record? || (!locking_enabled? && save_version?)
0
           end
0