summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-04-03 10:48:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-04-03 10:48:59 +0000
commit9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21 (patch)
treee3f468afda2267be4f6c3236143cfd01d4037785 /app/controllers
parent91e24303012163d1fcdf91361486c3a80d1a1a4c (diff)
downloadredmine-9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21.tar.gz
redmine-9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21.zip
Send email even if password is not changed (#7577).
git-svn-id: http://svn.redmine.org/redmine/trunk@16453 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 60600a252..7dcaa7962 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -140,7 +140,7 @@ class UsersController < ApplicationController
if was_activated
Mailer.account_activated(@user).deliver
- elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current
+ elsif @user.active? && params[:send_information] && @user != User.current
Mailer.account_information(@user, @user.password).deliver
end