From 1b0466dd830e7bef020a04b4b750bf3c31eb5c65 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 20 Jul 2018 18:54:02 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=9D=B8=EC=A6=9D?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=20=EB=A7=8C=EB=A3=8C=EC=8B=9C=20=EC=95=88?=
 =?UTF-8?q?=EB=82=B4=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

xpressengine/xe-core#2112
---
 modules/member/lang/en.php           | 1 +
 modules/member/lang/ko.php           | 1 +
 modules/member/member.controller.php | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php
index c47af54fc..55159127f 100644
--- a/modules/member/lang/en.php
+++ b/modules/member/lang/en.php
@@ -138,6 +138,7 @@ $lang->msg_confirm_account_comment = 'Click on the following link to complete yo
 $lang->msg_auth_mail_sent = 'The activation mail has been sent to %s. Please check your mail.';
 $lang->msg_confirm_mail_sent = 'We have just sent the activation email to %s. Please check your mail.';
 $lang->msg_invalid_auth_key = 'This is an invalid request of verification.<br />Please retry finding account info or contact the administrator.';
+$lang->msg_expired_auth_key = 'Your verification link has expired. Please request a new verification email.';
 $lang->msg_success_authed = 'Please use the password you received in the email to log in, and change it to a password of your choice as soon as possible.';
 $lang->msg_success_confirmed = 'Your account has been activated. You may log in now.';
 $lang->msg_new_member = 'Add Member';
diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php
index 90f707169..9ce6d2bcb 100644
--- a/modules/member/lang/ko.php
+++ b/modules/member/lang/ko.php
@@ -146,6 +146,7 @@ $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되
 $lang->msg_change_mail_sent = '%s 메일로 이메일 변경 인증 메일이 발송되었습니다. 메일을 확인하세요.';
 $lang->msg_invalid_modify_email_auth_key = '잘못된 이메일 변경 요청입니다.<br />이메일 변경요청을 다시 하거나 사이트 관리자에게 문의해주세요.';
 $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하거나 사이트 관리자에게 계정 정보를 문의해주세요.';
+$lang->msg_expired_auth_key = '인증 유효기간이 지났습니다. 인증을 다시 요청해 주십시오.';
 $lang->msg_success_authed = '임시 비밀번호로 변경되었습니다.<br />로그인 후 반드시 다른 비밀번호로 변경하시기 바랍니다.';
 $lang->msg_success_confirmed = '가입 인증이 완료되었습니다. 이제 로그인하실 수 있습니다.';
 $lang->msg_new_member = '회원 추가';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c766990a3..271e12db6 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1575,7 +1575,7 @@ class memberController extends member
 		if(ztime($output->data->regdate) < time() - (86400 * 3))
 		{
 			executeQuery('member.deleteAuthMail', $args);
-			return $this->stop('msg_invalid_auth_key');
+			return $this->stop('msg_expired_auth_key');
 		}
 
 		// Back up the value of $output->data->is_register