From a85374b56d14e7c1e77b5de49b44300e023ea5e6 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 14 Sep 2011 13:25:46 -0400 Subject: [PATCH] fixes #61: Editing your profile always sets your password to blank. --- app/models/user.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 80a8d82cf..61d06eabe 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -19,7 +19,7 @@ class User < ActiveRecord::Base validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" validates_uniqueness_of :name, :case_sensitive => false, :on => :create validates_uniqueness_of :email, :case_sensitive => false, :on => :create, :if => lambda {|rec| !rec.email.blank?} - validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || !rec.password.blank?} + validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || rec.password.present?} validates_inclusion_of :default_image_size, :in => %w(medium large original) validates_confirmation_of :password validates_presence_of :email, :if => lambda {|rec| rec.new_record? && Danbooru.config.enable_email_verification?} @@ -100,7 +100,8 @@ class User < ActiveRecord::Base module PasswordMethods def encrypt_password - self.password_hash = self.class.sha1(password) if password + puts password.inspect + self.password_hash = self.class.sha1(password) if password.present? end def reset_password