From 60c46901c6f4ce4e1e64a0d0ac1d2ee621a1fb9b Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Mon, 29 Feb 2016 15:53:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=EC=84=A4=EC=A0=95=EC=9D=84=20=EC=98=AC=EB=B0=94?=
 =?UTF-8?q?=EB=A5=B4=EA=B2=8C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/point_level_icon/conf/info.xml         | 24 ++++++-------------
 .../point_level_icon/point_level_icon.lib.php |  8 +++----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml
index 6bbe48857..3597262b9 100644
--- a/addons/point_level_icon/conf/info.xml
+++ b/addons/point_level_icon/conf/info.xml
@@ -62,25 +62,15 @@
 
 	<extra_vars>
 		<var name="icon_duplication" type="select">
-			<title xml:lang="ko">아이콘 중복 설정</title>
-			<description xml:lang="ko">아이콘 중복 설정을 적용할 경우 그룹아이콘이 있을때 포인트 레벨 아이콘은 띄우지 않도록 합니다.</description>
+			<title xml:lang="ko">아이콘 중복 방지</title>
+			<description xml:lang="ko">그룹아이콘이 있을 경우 중복으로 레벨 아이콘을 달지 않습니다.</description>
 			<options value="">
-				<title xml:lang="ko">적용하지 않음</title>
-				<title xml:lang="zh-CN">不启用</title>
-				<title xml:lang="jp">적용하지 않음</title>
-				<title xml:lang="zh-TW">關閉</title>
-				<title xml:lang="en">Not apply</title>
-				<title xml:lang="ru">Not apply</title>
-				<title xml:lang="vi">Không áp dụng</title>
+				<title xml:lang="ko">사용함</title>
+				<title xml:lang="en">Enabled</title>
 			</options>
-			<options value="Y">
-				<title xml:lang="ko">적용</title>
-				<title xml:lang="zh-CN">启用</title>
-				<title xml:lang="jp">적용</title>
-				<title xml:lang="zh-TW">開啟</title>
-				<title xml:lang="en">Apply</title>
-				<title xml:lang="ru">Apply</title>
-				<title xml:lang="vi">Áp dụng</title>
+			<options value="N">
+				<title xml:lang="ko">사용하지 않음</title>
+				<title xml:lang="en">Disabled</title>
 			</options>
 		</var>
 	</extra_vars>
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index f72b46359..2e6c6ff7c 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -13,18 +13,18 @@ function pointLevelIconTrans($matches, $addon_info)
 		return $matches[0];
 	}
 
-	$orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]);
-
-	if($addon_info->icon_duplication != 'Y')
+	if($addon_info->icon_duplication != 'N')
 	{
 		// Check Group Image Mark
 		$oMemberModel = getModel('member');
 		if($oMemberModel->getGroupImageMark($member_srl))
 		{
-			return $orig_text . $matches[5] . '</' . $matches[6] . '>';
+			return $matches[0];
 		}
 	}
 
+	$orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]);
+
 	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
 	{
 		// Get point configuration