From 5537945951b6a782d770d7d2fa24e183d2dfcdc9 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Fri, 23 Sep 2011 05:46:27 +0000
Subject: [PATCH] fixed show image_mark

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9300 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/member_extra_info/member_extra_info.lib.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php
index 2cf6e4477..cf6af6c29 100644
--- a/addons/member_extra_info/member_extra_info.lib.php
+++ b/addons/member_extra_info/member_extra_info.lib.php
@@ -29,8 +29,12 @@
         // If image name and mark doesn't exist, set the original information
         if(!$image_name_file && !$image_mark_file && !$group_image) return $matches[0];
 
-        if($image_name_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id: %s" style="vertical-align:middle;margin-right:3px" />', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
-        if($image_mark_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id : %s" style="vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
+		// check member_config
+		
+		$config = $oMemberModel->getMemberConfig();
+
+        if($config->image_name == 'Y' && $image_name_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id: %s" style="vertical-align:middle;margin-right:3px" />', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
+        if($config->image_mark == 'Y' && $image_mark_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id : %s" style="vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
 
         if($group_image) $nick_name = sprintf('<img src="%s" border="0" style="max-height:16px;vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);