From dc005d644163ce57592f1192c79dbbbf2bc2411c Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 21 Nov 2017 09:56:27 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php                            | 36 ++++++++++---------
 .../skin/outlogin/basic/outlogin.skin.2.php   |  2 +-
 skin/member/basic/profile.skin.php            |  2 +-
 skin/outlogin/basic/outlogin.skin.2.php       |  2 +-
 .../skin/outlogin/basic/outlogin.skin.2.php   |  2 +-
 .../basic/skin/member/basic/profile.skin.php  |  2 +-
 .../skin/outlogin/basic/outlogin.skin.2.php   |  2 +-
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 34ddb4876..619c158d5 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -3298,32 +3298,34 @@ function check_write_token($bo_table)
 }
 
 function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_image', $title=''){
-    global $is_member, $member;
+    global $member;
 
-    if( ! $is_member ) return '';
-
-    if( !$mb_id ) $mb_id = $member['mb_id'];
-
-    static $cache = array();
+    static $no_profile_cache = '';
+    static $member_cache = array();
     
     $src = '';
-    if( isset($cache[$mb_id]) ){
-        $src = $cache[$mb_id];
-    } else {
-        // 프로필 이미지가 없을때 기본 이미지
-        $no_profile_img = (defined('G5_THEME_NO_PROFILE_IMG') && G5_THEME_NO_PROFILE_IMG) ? G5_THEME_NO_PROFILE_IMG : G5_NO_PROFILE_IMG;
-        $tmp = array();
-        preg_match( '/src="([^"]*)"/i', $foo, $tmp );
-        $src = isset($tmp[1]) ? $tmp[1] : G5_IMG_URL.'/no_profile.gif';
 
-        if( $mb_id ){
+    if( $mb_id ){
+        if( isset($member_cache[$mb_id]) ){
+            $src = $member_cache[$mb_id];
+        } else {
             $member_img = G5_DATA_PATH.'/member_image/'.substr($mb_id,0,2).'/'.$mb_id.'.gif';
             if (is_file($member_img)) {
-                $src = str_replace(G5_DATA_PATH, G5_DATA_URL, $member_img);
+                $member_cache[$mb_id] = $src = str_replace(G5_DATA_PATH, G5_DATA_URL, $member_img);
             }
         }
+    }
 
-        $cache[$mb_id] = $src;
+    if( !$src ){
+        if( !empty($no_profile_cache) ){
+            $src = $no_profile_cache;
+        } else {
+            // 프로필 이미지가 없을때 기본 이미지
+            $no_profile_img = (defined('G5_THEME_NO_PROFILE_IMG') && G5_THEME_NO_PROFILE_IMG) ? G5_THEME_NO_PROFILE_IMG : G5_NO_PROFILE_IMG;
+            $tmp = array();
+            preg_match( '/src="([^"]*)"/i', $foo, $tmp );
+            $no_profile_cache = $src = isset($tmp[1]) ? $tmp[1] : G5_IMG_URL.'/no_profile.gif';
+        }
     }
 
     if( $src ){
diff --git a/mobile/skin/outlogin/basic/outlogin.skin.2.php b/mobile/skin/outlogin/basic/outlogin.skin.2.php
index 0a986b713..6b338c82a 100644
--- a/mobile/skin/outlogin/basic/outlogin.skin.2.php
+++ b/mobile/skin/outlogin/basic/outlogin.skin.2.php
@@ -11,7 +11,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
     <h2>나의 회원정보</h2>
     <div id="ol_after_hd">
         <span class="profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($member['mb_id']); ?>
             <a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=register_form.php" id="ol_after_info" title="정보수정">정보수정</a>
         </span>
         <strong><?php echo $nick ?>님</strong>
diff --git a/skin/member/basic/profile.skin.php b/skin/member/basic/profile.skin.php
index c5ae7053b..31fa9c15c 100644
--- a/skin/member/basic/profile.skin.php
+++ b/skin/member/basic/profile.skin.php
@@ -10,7 +10,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <h1 id="win_title"><?php echo $mb_nick ?>님의 프로필</h1>
     <div class="profile_name">
         <span class="my_profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($mb['mb_id']); ?>
         </span>
         <?php echo $mb_nick ?>
     </div>
diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php
index 1aa3fa9e5..2341db4c8 100644
--- a/skin/outlogin/basic/outlogin.skin.2.php
+++ b/skin/outlogin/basic/outlogin.skin.2.php
@@ -10,7 +10,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
     <header id="ol_after_hd">
         <h2>나의 회원정보</h2>
         <span class="profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($member['mb_id']); ?>
             <a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=register_form.php" id="ol_after_info" title="정보수정"><i class="fa fa-cog" aria-hidden="true"></i><span class="sound_only">정보수정</span></a>
         </span>
         <strong><?php echo $nick ?>님</strong>
diff --git a/theme/basic/mobile/skin/outlogin/basic/outlogin.skin.2.php b/theme/basic/mobile/skin/outlogin/basic/outlogin.skin.2.php
index 0a986b713..6b338c82a 100644
--- a/theme/basic/mobile/skin/outlogin/basic/outlogin.skin.2.php
+++ b/theme/basic/mobile/skin/outlogin/basic/outlogin.skin.2.php
@@ -11,7 +11,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
     <h2>나의 회원정보</h2>
     <div id="ol_after_hd">
         <span class="profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($member['mb_id']); ?>
             <a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=register_form.php" id="ol_after_info" title="정보수정">정보수정</a>
         </span>
         <strong><?php echo $nick ?>님</strong>
diff --git a/theme/basic/skin/member/basic/profile.skin.php b/theme/basic/skin/member/basic/profile.skin.php
index c5ae7053b..31fa9c15c 100644
--- a/theme/basic/skin/member/basic/profile.skin.php
+++ b/theme/basic/skin/member/basic/profile.skin.php
@@ -10,7 +10,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <h1 id="win_title"><?php echo $mb_nick ?>님의 프로필</h1>
     <div class="profile_name">
         <span class="my_profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($mb['mb_id']); ?>
         </span>
         <?php echo $mb_nick ?>
     </div>
diff --git a/theme/basic/skin/outlogin/basic/outlogin.skin.2.php b/theme/basic/skin/outlogin/basic/outlogin.skin.2.php
index 1aa3fa9e5..2341db4c8 100644
--- a/theme/basic/skin/outlogin/basic/outlogin.skin.2.php
+++ b/theme/basic/skin/outlogin/basic/outlogin.skin.2.php
@@ -10,7 +10,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
     <header id="ol_after_hd">
         <h2>나의 회원정보</h2>
         <span class="profile_img">
-            <?php echo get_member_profile_img(); ?>
+            <?php echo get_member_profile_img($member['mb_id']); ?>
             <a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=register_form.php" id="ol_after_info" title="정보수정"><i class="fa fa-cog" aria-hidden="true"></i><span class="sound_only">정보수정</span></a>
         </span>
         <strong><?php echo $nick ?>님</strong>