From cbae967a8c431698bdaa60930eca87a51303dcd1 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Sat, 16 Jan 2021 11:38:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BA=90=EC=8B=9C=20=EB=B9=84=EC=9A=B8?=
 =?UTF-8?q?=EB=95=8C=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=ED=8C=8C?=
 =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XE 서드파티모듈 호환성을 위한 더미 메소드에서 site_srl 을 포함하여 넣을 가능성이 다분히 있습니다. 해당 규칙을 유지하기 위해 site_srl = 0 으로 살리되 메소드는 실제 사용하지 않도록 하고, 원래 해당 액션이 void 이기 때문에 return 을 사용하지 않고 라이믹스 코어의 고유 캐시 정보 처리하는 메소드를 호출하도록 하였습니다.
---
 modules/member/member.controller.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index e4a469064..9c3488511 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1034,7 +1034,7 @@ class memberController extends member
 			}
 		}
 
-		self::clearMemberCache($args->member_srl, $site_module_info->site_srl);
+		self::clearMemberCache($args->member_srl);
 
 		$this->setRedirectUrl($returnUrl);
 	}
@@ -1266,8 +1266,7 @@ class memberController extends member
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
 
-		$site_module_info = Context::get('site_module_info');
-		self::clearMemberCache($args->member_srl, $site_module_info->site_srl);
+		self::clearMemberCache($args->member_srl);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -2105,7 +2104,7 @@ class memberController extends member
 		$output = executeQuery('member.deleteMembersGroup', $args);
 		if(!$output->toBool()) return $output;
 		$this->setMessage('success_deleted');
-		self::clearMemberCache($args->member_srl, $site_module_info->site_srl);
+		self::clearMemberCache($args->member_srl);
 	}
 
 	/**
@@ -2211,7 +2210,7 @@ class memberController extends member
 		$output = executeQuery('member.addMemberToGroup',$args);
 		ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
 
-		self::clearMemberCache($member_srl, $site_srl);
+		self::clearMemberCache($member_srl);
 
 		return $output;
 	}
@@ -2251,7 +2250,7 @@ class memberController extends member
 			$output = executeQuery('member.addMemberToGroup', $obj);
 			if(!$output->toBool()) return $output;
 
-			self::clearMemberCache($obj->member_srl, $args->site_srl);
+			self::clearMemberCache($obj->member_srl);
 		}
 
 		return new BaseObject();
@@ -2465,11 +2464,10 @@ class memberController extends member
 		$args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
 
-		$site_module_info = Context::get('site_module_info');
-		self::clearMemberCache($args->member_srl, $site_module_info->site_srl);
+		self::clearMemberCache($args->member_srl);
 
 		// Check if there is recoding table.
-		$oDB = &DB::getInstance();
+		$oDB = DB::getInstance();
 		if($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N')
 		{
 			// check if there is login fail records.
@@ -3200,7 +3198,7 @@ class memberController extends member
 
 		// Remove from cache
 		unset($GLOBALS['__member_info__'][$args->member_srl]);
-		self::clearMemberCache($args->member_srl, $args->site_srl);
+		self::clearMemberCache($args->member_srl);
 
 		$output->add('member_srl', $args->member_srl);
 		return $output;
@@ -3943,10 +3941,11 @@ class memberController extends member
 	
 	/**
 	 * @deprecated
+	 * @return void
 	 */
-	public static function _clearMemberCache($member_srl)
+	public static function _clearMemberCache($member_srl, $site_srl = 0)
 	{
-		return self::clearMemberCache($member_srl);
+		self::clearMemberCache($member_srl);
 	}
 	
 	/**