diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml index 174175fca..0ca3b2f22 100644 --- a/addons/point_level_icon/conf/info.xml +++ b/addons/point_level_icon/conf/info.xml @@ -59,4 +59,29 @@ NAVER NAVER + + + + 아이콘 중복 방지 설정 + 아이콘 중복 방지 설정을 적용할 경우 그룹아이콘이 있을때 포인트 레벨 아이콘은 띄우지 않도록 합니다. + + 적용하지 않음 + 不启用 + 적용하지 않음 + 關閉 + Not apply + Not apply + Không áp dụng + + + 적용 + 启用 + 적용 + 開啟 + Apply + Apply + Áp dụng + + + diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php index 69f7eb8d9..fd3b2919e 100644 --- a/addons/point_level_icon/point_level_icon.addon.php +++ b/addons/point_level_icon/point_level_icon.addon.php @@ -19,7 +19,9 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php'); -$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output); +$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', function($matches) use($addon_info) { + return pointLevelIconTrans($matches, $addon_info); +}, $output); if($temp_output) { $output = $temp_output; diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index 9dd9e3054..982259d21 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -4,7 +4,7 @@ /** * @brief Function to change point icon. */ -function pointLevelIconTrans($matches) +function pointLevelIconTrans($matches, $addon_info) { $member_srl = $matches[3]; // If anonymous or not member_srl go to Hide Point Icon @@ -15,12 +15,14 @@ function pointLevelIconTrans($matches) $orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]); - $oMemberModel = getModel('member'); - - // Check Group Image Mark - if($oMemberModel->getGroupImageMark($member_srl)) + if($addon_info->icon_duplication == 'Y') { - return $orig_text . $matches[5] . ''; + // Check Group Image Mark + $oMemberModel = getModel('member'); + if($oMemberModel->getGroupImageMark($member_srl)) + { + return $orig_text . $matches[5] . ''; + } } if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))