From ae346718a4d7f5870cfea00c319f4a28e1099153 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 5 Jan 2016 10:21:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EA=B0=80=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=98?=
 =?UTF-8?q?=EA=B1=B0=EB=82=98=20=EC=88=98=EC=A0=95=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EA=B8=88=EC=A7=80=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EB=94=94=EB=A5=BC=20=ED=99=95=EC=9D=B8=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6212d6254..dead10f27 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1988,7 +1988,7 @@ class memberController extends member
 		}
 
 		// Check if ID is prohibited
-		if($oMemberModel->isDeniedID($args->user_id))
+		if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedID($args->user_id))
 		{
 			return new Object(-1,'denied_user_id');
 		}
@@ -2001,7 +2001,7 @@ class memberController extends member
 		}
 
 		// Check if nickname is prohibited
-		if($oMemberModel->isDeniedNickName($args->nick_name))
+		if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedNickName($args->nick_name))
 		{
 			return new Object(-1,'denied_nick_name');
 		}
@@ -2014,7 +2014,7 @@ class memberController extends member
 		}
 
 		// Check managed Email Host
-		if($oMemberModel->isDeniedEmailHost($args->email_address))
+		if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedEmailHost($args->email_address))
 		{
 			$config = $oMemberModel->getMemberConfig();
 			$emailhost_check = $config->emailhost_check;
@@ -2175,7 +2175,7 @@ class memberController extends member
 		$orgMemberInfo = $output->data;
 
 		// Check managed Email Host
-		if($oMemberModel->isDeniedEmailHost($args->email_address))
+		if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedEmailHost($args->email_address))
 		{
 			$config = $oMemberModel->getMemberConfig();
 			$emailhost_check = $config->emailhost_check;
@@ -2212,7 +2212,7 @@ class memberController extends member
 		}
 
 		// Check if ID is prohibited
-		if($args->user_id && $oMemberModel->isDeniedID($args->user_id))
+		if($logged_info->is_admin !== 'Y' && $args->user_id && $oMemberModel->isDeniedID($args->user_id))
 		{
 			return new Object(-1,'denied_user_id');
 		}
@@ -2228,7 +2228,7 @@ class memberController extends member
 		}
 
 		// Check if nickname is prohibited
-		if($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
+		if($logged_info->is_admin !== 'Y' && $args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
 		{
 			return new Object(-1, 'denied_nick_name');
 		}