X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/721dd9c27d299455b9159457a095716f797389f1..4de6006567ccff573277c9fcfbf9cb3d6bb83a63:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index ce244fe02..2adbbb9a1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,7 +30,7 @@ class User < ActiveRecord::Base
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize
-    self.creation_time = Time.now if self.creation_time.nil?
+    self.creation_time = Time.now.getutc if self.creation_time.nil?
   end
 
   def encrypt_password
@@ -113,7 +113,7 @@ class User < ActiveRecord::Base
   def delete
     self.active = false
     self.display_name = "user_#{self.id}"
-    self.description = nil
+    self.description = ""
     self.home_lat = nil
     self.home_lon = nil
     self.image = nil