From f85055d653b843b67a4fc6b72b82c0476dd20569 Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Thu, 1 Feb 2018 08:59:37 -0500
Subject: [PATCH] FIX: Remove activation link from account approved email
 (#5548)

---
 app/mailers/user_notifications.rb | 1 -
 app/models/user.rb                | 3 +--
 config/locales/server.en.yml      | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 236acc0dabd..17260a5d8e1 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -22,7 +22,6 @@ class UserNotifications < ActionMailer::Base
     build_email(user.email,
                 template: 'user_notifications.signup_after_approval',
                 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))
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 1d4283659e6..464d3fe9d78 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1096,8 +1096,7 @@ class User < ActiveRecord::Base
     if SiteSetting.must_approve_users
       Jobs.enqueue(:critical_user_email,
         type: :signup_after_approval,
-        user_id: id,
-        email_token: email_tokens.first.token
+        user_id: id
       )
     end
   end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 603f92adc06..c32b730f3fc 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2836,8 +2836,8 @@ en:
 
         A staff member approved your account on %{site_name}.
 
-        Click the following link to confirm and activate your new account:
-        %{base_url}/u/activate-account/%{email_token}
+        You can now access your new account by logging in at:
+        %{base_url}
 
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.