From beaf02a9a3945cc0d3a2cd70bd7b42ed1875fd83 Mon Sep 17 00:00:00 2001 From: devjin Date: Thu, 9 Feb 2012 09:10:00 +0000 Subject: [PATCH] issue 1435 fixed according to the priority groups icon to be exposed. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10101 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.model.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 66f372a68..5ed768a58 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -629,8 +629,10 @@ /** * @brief Get the image mark of the group **/ - function getGroupImageMark($member_srl,$site_srl=0) { - if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) { + function getGroupImageMark($member_srl,$site_srl=0) + { + if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) + { $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); if($config->group_image_mark!='Y'){ @@ -638,21 +640,24 @@ } $member_group = $this->getMemberGroups($member_srl,$site_srl); $groups_info = $this->getGroups($site_srl); - $image_mark_info = null; - if(count($member_group) > 0 && is_array($member_group)){ - $group_srl = array_keys($member_group); + if(count($member_group) > 0 && is_array($member_group)) + { + $memberGroups = array_keys($member_group); } - $i = 0; - while($i < count($group_srl)){ - $target = $groups_info[$group_srl[$i++]]; - if ($target->image_mark) + foreach($groups_info as $group_srl=>$group_info) + { + if(in_array($group_srl, $memberGroups)) { - $info->title = $target->title; - $info->description = $target->description; - $info->src = $target->image_mark; - $GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info; - } + if($group_info->image_mark) + { + $info->title = $group_info->title; + $info->description = $group_info->description; + $info->src = $group_info->image_mark; + $GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info; + break; + } + } } if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N'; }