From f096122b6c530d41276bd21be8a37e36c56f506f Mon Sep 17 00:00:00 2001
From: ONEXIN <onexin@qq.com>
Date: Tue, 17 Mar 2020 08:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E8=AF=8D=E6=9D=A1user=5Fbanned=5Fhas=5Fexpiry=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/class/discuz/discuz_application.php | 2 +-
 upload/source/language/lang_message.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/upload/source/class/discuz/discuz_application.php b/upload/source/class/discuz/discuz_application.php
index 9157741ae..d5346e83a 100644
--- a/upload/source/class/discuz/discuz_application.php
+++ b/upload/source/class/discuz/discuz_application.php
@@ -584,7 +584,7 @@ class discuz_application extends discuz_base{
 			if($this->var['group'] && isset($this->var['group']['allowvisit']) && !$this->var['group']['allowvisit']) {
 				if($this->var['uid'] && !$allowvisitflag) {
 					if(!defined('IN_MOBILE_API')) {
-						($this->var['member']['groupexpiry'] > 0) ? showmessage('user_banned_has_expiry') : showmessage('user_banned');
+						($this->var['member']['groupexpiry'] > 0) ? showmessage('user_banned_has_expiry', '', array('expiry' => dgmdate($_G['member']['groupexpiry'], 'Y-m-d H:i:s'))) : showmessage('user_banned');
 					} else {
 						($this->var['member']['groupexpiry'] > 0) ? mobile_core::result(array('error' => 'user_banned_has_expiry')) : mobile_core::result(array('error' => 'user_banned'));
 					}
diff --git a/upload/source/language/lang_message.php b/upload/source/language/lang_message.php
index 8830c7bfa..d470f8bb8 100644
--- a/upload/source/language/lang_message.php
+++ b/upload/source/language/lang_message.php
@@ -236,7 +236,7 @@ $lang = array (
   'task_not_found' => '任务文件丢失，{taskclassname}',
   'task_not_underway' => '不是进行中的任务',
   'user_banned' => '抱歉，您的 IP 地址不在允许范围内，或您的账号被禁用，无法访问本站点',
-  'user_banned_has_expiry' => '抱歉，您的账号被禁用，暂无法访问本站点。<br />预计解禁时间：'.dgmdate($_G['member']['groupexpiry'], 'Y-m-d H:i:s'),
+  'user_banned_has_expiry' => '抱歉，您的账号被禁用，暂无法访问本站点。<br />预计解禁时间：{expiry}',
   'submit_seccode_invalid' => '抱歉，验证码填写错误',
   'submit_invalid' => '抱歉，您的请求来路不正确或表单验证串不符，无法提交',
   'word_banned' => '抱歉，您填写的内容包含不良信息而无法提交',
-- 
Gitee