From 960f519271e75ce1b67b4dc8c7ac35a7dd6c929e Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Thu, 19 May 2016 15:27:48 +0800
Subject: [PATCH] Fix approve and welcome email with set password link

---
 core/um-user.php                    | 9 +++++----
 templates/email/approved_email.html | 2 +-
 templates/email/welcome_email.html  | 2 +-
 um-config.php                       | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/um-user.php b/core/um-user.php
index 2bd9e950..d72984a6 100644
--- a/core/um-user.php
+++ b/core/um-user.php
@@ -467,14 +467,15 @@ class UM_User {
 		delete_option( "um_cache_userdata_{$user_id}" );
 
 		if ( um_user('account_status') == 'awaiting_admin_review' ) {
-			$email_tpl = 'approved_email';
+			$this->password_reset_hash();
+			$ultimatemember->mail->send( um_user('user_email'), 'approved_email' );
+
 		} else {
-			$email_tpl = 'welcome_email';
+			$this->password_reset_hash();
+			$ultimatemember->mail->send( um_user('user_email'), 'welcome_email');
 		}
 
 		$this->set_status('approved');
-		$ultimatemember->mail->send( um_user('user_email'), $email_tpl );
-
 		$this->delete_meta('account_secret_hash');
 		$this->delete_meta('_um_cool_but_hard_to_guess_plain_pw');
 
diff --git a/templates/email/approved_email.html b/templates/email/approved_email.html
index 0da1a52f..490ec602 100644
--- a/templates/email/approved_email.html
+++ b/templates/email/approved_email.html
@@ -21,7 +21,7 @@
 		
 			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account e-mail:</span> <span style="font-weight:bold">{email}</span></div>
 			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account username:</span> <span style="font-weight:bold">{username}</span></div>
-			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account password:</span> <span style="font-weight:bold">{password}</span></div>
+			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Set your password:</span> <span style="font-weight:bold">{password_reset_link}</span></div>
 		
 		</div>
 		
diff --git a/templates/email/welcome_email.html b/templates/email/welcome_email.html
index 069d3032..227c8c4b 100644
--- a/templates/email/welcome_email.html
+++ b/templates/email/welcome_email.html
@@ -21,7 +21,7 @@
 		
 			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account e-mail:</span> <span style="font-weight:bold">{email}</span></div>
 			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account username:</span> <span style="font-weight:bold">{username}</span></div>
-			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Your account password:</span> <span style="font-weight:bold">{password}</span></div>
+			<div style="padding: 10px 15px 0 15px;color: #333;"><span style="color:#999">Set your password:</span> <span style="font-weight:bold">{password_reset_link}</span></div>
 		
 		</div>
 		
diff --git a/um-config.php b/um-config.php
index 9393cecd..e6d79ddb 100644
--- a/um-config.php
+++ b/um-config.php
@@ -612,7 +612,7 @@ $this->sections[] = array(
 										  '{login_url}'  . "\r\n\r\n" .
 										  'Your account e-mail: {email}' . "\r\n" .
 										  'Your account username: {username}' . "\r\n" .
-										  'Your account password: {password}' . "\r\n\r\n" .
+										  'Set your account passowrd: {password_reset_link}' . "\r\n\r\n" .
 										  'If you have any problems, please contact us at {admin_email}'  . "\r\n\r\n" .
 										  'Thanks,' . "\r\n" .
 										  '{site_name}',
@@ -712,7 +712,7 @@ $this->sections[] = array(
 										  '{login_url}'  . "\r\n\r\n" .
 										  'Your account e-mail: {email}' . "\r\n" .
 										  'Your account username: {username}' . "\r\n" .
-										  'Your account password: {password}' . "\r\n\r\n" .
+										  'Set your account passowrd: {password_reset_link}' . "\r\n\r\n" .
 										  'If you have any problems, please contact us at {admin_email}'  . "\r\n\r\n" .
 										  'Thanks,' . "\r\n" .
 										  '{site_name}',