From 7a0172b559f0001e918b27f9f8f2326358a35730 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 21 Dec 2017 15:39:23 +0900
Subject: [PATCH] Do not display duplicate nickname warning if duplicate is
 allowed

---
 modules/member/member.controller.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index f89f5077e..2760c06b3 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -517,10 +517,11 @@ class memberController extends member
 		if(!$value) return;
 
 		$oMemberModel = getModel('member');
+		$config = $oMemberModel->getMemberConfig();
+
 		// Check if logged-in
 		$logged_info = Context::get('logged_info');
 
-
 		switch($name)
 		{
 			case 'user_id' :
@@ -537,15 +538,16 @@ class memberController extends member
 					return new BaseObject(0,'denied_nick_name');
 				}
 				// Check if duplicated
-				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
-
+				if($config->allow_duplicate_nickname !== 'Y')
+				{
+					$member_srl = $oMemberModel->getMemberSrlByNickName($value);
+					if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
+				}
 				break;
 			case 'email_address' :
 				// Check managed Email Host
 				if($oMemberModel->isDeniedEmailHost($value))
 				{
-					$config = $oMemberModel->getMemberConfig();
 					$emailhost_check = $config->emailhost_check;
 
 					$managed_email_host = lang('managed_email_host');