From ee4cc5e3b88ef84ab18710618c6936576c269154 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 29 May 2007 10:03:27 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1506
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/member_extra_info/member_extra_info.addon.php |  2 +-
 modules/member/member.controller.php                 | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index 3f3effc22..8495e90e4 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -30,7 +30,7 @@
         $oMemberController = &getController('member');
 
         // 1. 출력문서중에서 <div class="member_번호">content</div>를 찾아 MemberController::transImageName() 를 이용하여 이미지이름/마크로 변경
-        $output = preg_replace_callback('!<div([^\>]*)member_([0-9\-]*)([^\>]*)>(.*?)\<\/div\>!is', array($oMemberController, 'transImageName'), $output);
+        $output = preg_replace_callback('!<(div|span)([^\>]*)member_([0-9\-]*)([^\>]*)>(.*?)\<\/(div|span)\>!is', array($oMemberController, 'transImageName'), $output);
 
         // 2. 출력문서중에 <!--AfterDocument(문서번호,회원번호)--> 를 찾아서 member_controller::transSignature()를 이용해서 서명을 추가
         $output = preg_replace_callback('/<!--AfterDocument\(([0-9]+),([0-9]+)\)-->/i', array($oMemberController, 'transSignature'), $output);
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 828c03acc..24bccd1d4 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1316,10 +1316,10 @@
          * member_extra_info 애드온에서 요청이 됨
          **/
         function transImageName($matches) {
-            $member_srl = $matches[2];
-            if($member_srl<0) return $matches[4];
+            $member_srl = $matches[3];
+            if($member_srl<0) return $matches[5];
 
-            $text = $matches[4];
+            $text = $matches[5];
             if(!$member_srl) return $matches[0];
 
             // 전역변수에 미리 설정한 데이터가 있다면 그걸 return
@@ -1342,10 +1342,10 @@
                         $text = sprintf('<img src="%s" border="0" alt="image" width="%s" height="%s" style="margin-top:%dpx;"/>', $image_name->file, $image_name->width, $image_name->height, $top_margin);
                     }
 
-                    if($image_mark->width) $buff = sprintf('<div style="background:url(%s) no-repeat left;padding-left:%dpx; height:%dpx">%s</div>', $image_mark->file, $image_mark->width+2, $image_mark->height, $text);
+                    if($image_mark->width) $buff = sprintf('<%s style="cursor:pointer;background:url(%s) no-repeat left;padding-left:%dpx; height:%dpx">%s</%s>', $matches[1],$image_mark->file, $image_mark->width+2, $image_mark->height, $text, $matches[6]);
                     else $buff = $text;
 
-                    $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[4], $buff, $matches[0]);
+                    $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[5], $buff, $matches[0]);
                 }
             }