From fc14a04173a53b3f0a71637e7b25d51f971ab4b4 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 7 Feb 2022 21:43:35 +0900
Subject: [PATCH] Clean up getMemberMenu() method

---
 modules/member/member.model.php | 35 ++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index c02500270..0677fdef1 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -181,26 +181,37 @@ class memberModel extends member
 	{
 		// Get member_srl of he target member and logged info of the current user
 		$member_srl = Context::get('target_srl');
+		if ($member_srl <= 0)
+		{
+			return;
+		}
+		
 		$mid = Context::get('cur_mid');
 		$logged_info = Context::get('logged_info');
 		$module_config = self::getMemberConfig();
-		$act = Context::get('cur_act');
-		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
-		// When click other's nickname
-		else $member_info = self::getMemberInfoByMemberSrl($member_srl);
-
-		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
-
-		// List variables
-		$user_id = $member_info->user_id;
-		$user_name = $member_info->user_name;
 		$icon_path = '';
+		
+		// Get requested member info
+		if($member_srl == $logged_info->member_srl)
+		{
+			$member_info = $logged_info;
+		}
+		else
+		{
+			$member_info = self::getMemberInfoByMemberSrl($member_srl);
+		}
+
+		// Check if member_info is valid
+		$member_srl = $member_info->member_srl;
+		if (!$member_srl)
+		{
+			return;
+		}
 
 		ModuleHandler::triggerCall('member.getMemberMenu', 'before', $member_info);
 
 		$oMemberController = MemberController::getInstance();
+		
 		// Display member information (Don't display to non-logged user)
 		if($logged_info->member_srl)
 		{