Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove activation link from account approved email (#5548)

This commit is contained in:
Joshua Rosenfeld 2018-02-01 08:59:37 -05:00 committed by Gerhard Schlager
parent a08832bd08
commit f85055d653
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/mailers/user_notifications.rb
View File

@ -22,7 +22,6 @@ class UserNotifications < ActionMailer::Base
build_email(user.email, build_email(user.email,
template: 'user_notifications.signup_after_approval', template: 'user_notifications.signup_after_approval',
locale: user_locale(user), locale: user_locale(user),
email_token: opts[:email_token],
new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale)) new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
end end

3
app/models/user.rb
View File

@ -1096,8 +1096,7 @@ class User < ActiveRecord::Base
if SiteSetting.must_approve_users if SiteSetting.must_approve_users
Jobs.enqueue(:critical_user_email, Jobs.enqueue(:critical_user_email,
type: :signup_after_approval, type: :signup_after_approval,
user_id: id, user_id: id
email_token: email_tokens.first.token
) )
end end
end end

4
config/locales/server.en.yml
View File

@ -2836,8 +2836,8 @@ en:
A staff member approved your account on %{site_name}. A staff member approved your account on %{site_name}.
Click the following link to confirm and activate your new account: You can now access your new account by logging in at:
%{base_url}/u/activate-account/%{email_token} %{base_url}
If the above link is not clickable, try copying and pasting it into the address bar of your web browser. If the above link is not clickable, try copying and pasting it into the address bar of your web browser.