X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38758821725b85e49efbaa8d44735c81c92cf775..f0feca800d91ac1d23eb63ca17a45d8fd4d41920:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index f5c435309..20f1ba432 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -46,10 +46,6 @@ class User < ActiveRecord::Base validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true - attr_accessible :display_name, :email, :email_confirmation, :openid_url, - :pass_crypt, :pass_crypt_confirmation, :consider_pd, - :image_use_gravatar - after_initialize :set_defaults before_save :encrypt_password after_save :spam_check @@ -246,7 +242,9 @@ private end def encrypt_password +logger.info "XXX" if pass_crypt_confirmation +logger.info "YYY" self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt) self.pass_crypt_confirmation = nil end