summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-23 16:57:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-23 16:57:45 +0000
commite14caf8e33fbe4099815e404e72f34f7601b24b6 (patch)
tree58d8ad932d944792923421e30b933f239a327046 /app/models
parentfac4a79d4c2dbf3c7045770d3d4e3310e04439d2 (diff)
downloadredmine-e14caf8e33fbe4099815e404e72f34f7601b24b6.tar.gz
redmine-e14caf8e33fbe4099815e404e72f34f7601b24b6.zip
Use User#generate_password in MailHandler.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11457 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/mail_handler.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index febee3d1c..0e07f1069 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -429,10 +429,8 @@ class MailHandler < ActionMailer::Base
assign_string_attribute_with_limit(user, 'firstname', names.shift, 30)
assign_string_attribute_with_limit(user, 'lastname', names.join(' '), 30)
user.lastname = '-' if user.lastname.blank?
-
- password_length = [Setting.password_min_length.to_i, 10].max
- user.password = Redmine::Utils.random_hex(password_length / 2 + 1)
user.language = Setting.default_language
+ user.generate_password = true
unless user.valid?
user.login = "user#{Redmine::Utils.random_hex(6)}" unless user.errors[:login].blank?