Merge 14059:14394 from trunk.

[rails.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 05aae0896847509a6d92c92c8011a54fe7d95808..f6726f91a05c730506979e93153c0f1cfca1a2c0 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -171,7 +171,6 @@ class Node < ActiveRecord::Base
   
   def create_with_history(user)
     check_create_consistency(self, user)
-    self.id = nil
     self.version = 0
     self.visible = true
 
@@ -267,7 +266,7 @@ class Node < ActiveRecord::Base
   private
 
   def save_with_history!
-    t = Time.now
+    t = Time.now.getutc
     Node.transaction do
       self.version += 1
       self.timestamp = t