diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-09 09:12:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-09 09:12:45 +0000 |
| commit | a4a400e606f865d5008e42d5815b70825d7dfbf4 (patch) | |
| tree | 16570712c84acd81f6165ac7144f7fe3fc89fda9 | |
| parent | ea90298f2a2b551e902c24d56aab64691af5c804 (diff) | |
| download | redmine-a4a400e606f865d5008e42d5815b70825d7dfbf4.tar.gz redmine-a4a400e606f865d5008e42d5815b70825d7dfbf4.zip | |
Merged r14966 (#21436).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15021 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/users/_general.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9ce80111a..33699325b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -143,7 +143,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? + elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current Mailer.account_information(@user, @user.password).deliver end diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index 0daa421c7..7d84c0ced 100644 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -1,6 +1,6 @@ <%= labelled_form_for @user do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> - <% if @user.active? && email_delivery_enabled? -%> + <% if @user.active? && email_delivery_enabled? && @user != User.current -%> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> <% end -%> <p><%= submit_tag l(:button_save) %></p> |