From 97da2756041c8ab6e8c6786b36d039def8fdf9fd Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Mon, 15 Feb 2021 22:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=A0=B8=E9=82=AE=E4=BB=B6=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E5=8F=82=E6=95=B0=E4=BB=A5=E5=8F=8A=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=A0=B8=E5=8B=BE=E9=80=89=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/moderate/moderate_member.php | 6 +++---
 upload/source/include/modcp/modcp_moderate.php     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/upload/source/admincp/moderate/moderate_member.php b/upload/source/admincp/moderate/moderate_member.php
index d8148064b..3dd2c62bd 100644
--- a/upload/source/admincp/moderate/moderate_member.php
+++ b/upload/source/admincp/moderate/moderate_member.php
@@ -245,7 +245,7 @@ EOT;
 						if(isset($members[$uid])) {
 							$member = $members[$uid];
 							$member['regdate'] = dgmdate($member['regdate']);
-							$member['submitdate'] = dgmdate($member['submitdate']);
+							$member['submitdate'] = dgmdate($allmembervalidate[$uid]['submitdate']);
 							$member['moddate'] = dgmdate(TIMESTAMP);
 							$member['operation'] = $o;
 							$member['remark'] = $_GET['remark'][$uid] ? dhtmlspecialchars($_GET['remark'][$uid]) : $lang['none'];
@@ -254,8 +254,8 @@ EOT;
 								'bbname' => $_G['setting']['bbname'],
 								'regdate' => $member['regdate'],
 								'submitdate' => $member['submitdate'],
-								'submittimes' => $member['submittimes'],
-								'message' => $member['message'],
+								'submittimes' => $allmembervalidate[$uid]['submittimes'],
+								'message' => $allmembervalidate[$uid]['message'],
 								'modresult' => lang('email', 'moderate_member_'.$member['operation']),
 								'moddate' => $member['moddate'],
 								'adminusername' => $_G['member']['username'],
diff --git a/upload/source/include/modcp/modcp_moderate.php b/upload/source/include/modcp/modcp_moderate.php
index 62b22547b..636436552 100644
--- a/upload/source/include/modcp/modcp_moderate.php
+++ b/upload/source/include/modcp/modcp_moderate.php
@@ -69,6 +69,7 @@ if($op == 'members') {
 					C::t('common_member_validate')->update($uids, array('moddate' => $_G['timestamp'], 'admin' => $_G['username'], 'status' => '1', 'remark' => $reason));
 				}
 
+				$sendemail = isset($_GET['sendemail']) ? $_GET['sendemail'] : 0;
 				if($sendemail) {
 					if(!function_exists('sendmail')) {
 						include libfile('function/mail');
-- 
Gitee