From 50f546b316c9e0ea183344ba688d7f458d92cabf Mon Sep 17 00:00:00 2001 From: hjhj3686 Date: Wed, 8 Jul 2015 21:43:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=9D=B4=20=EC=95=84?= =?UTF-8?q?=EB=8B=90=EA=B2=BD=EC=9A=B0=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=88=A8=EA=B8=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/point_level_icon/point_level_icon.lib.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index 3eb2a61d8..efbe41c0c 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -14,8 +14,15 @@ function pointLevelIconTrans($matches) $orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]); - // Check Group Image Mark $oMemberModel = getModel('member'); + // If not a member go to Hide Point Icon + $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); + if(!$member_info) + { + return $mathches[0]; + } + + // Check Group Image Mark if($oMemberModel->getGroupImageMark($member_srl)) { return $orig_text . $matches[5] . ''; From 4b1a5551ee0f6f6d9d7193813f9a79e4d7b3645c Mon Sep 17 00:00:00 2001 From: hjhj3686 Date: Wed, 8 Jul 2015 21:43:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/point_level_icon/point_level_icon.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index efbe41c0c..544c2fa18 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -19,7 +19,7 @@ function pointLevelIconTrans($matches) $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$member_info) { - return $mathches[0]; + return $matches[0]; } // Check Group Image Mark From 710cfd12d7fb6966fa3afd50adf9c54bd97e7627 Mon Sep 17 00:00:00 2001 From: hjhj3686 Date: Sun, 12 Jul 2015 14:18:30 +0900 Subject: [PATCH 3/3] #1603 source compaction @ioz2014 https://github.com/xpressengine/xe-core/issues/1603#issuecomment-120680480 --- addons/point_level_icon/point_level_icon.lib.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index 544c2fa18..9dd9e3054 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -7,7 +7,8 @@ function pointLevelIconTrans($matches) { $member_srl = $matches[3]; - if($member_srl < 1) + // If anonymous or not member_srl go to Hide Point Icon + if($member_srl < 1||!$member_srl) { return $matches[0]; } @@ -15,12 +16,6 @@ function pointLevelIconTrans($matches) $orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]); $oMemberModel = getModel('member'); - // If not a member go to Hide Point Icon - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); - if(!$member_info) - { - return $matches[0]; - } // Check Group Image Mark if($oMemberModel->getGroupImageMark($member_srl))