From 3c82e4cd7443f1a4a07ce0bedc692aa775f350f6 Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Sun, 20 Jun 2021 14:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A5=BD=E5=8F=8B-?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82-=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E6=88=96=E6=9F=A5=E6=89=BE=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/include/spacecp/spacecp_friend.php | 11 +++++++++--
 upload/source/include/spacecp/spacecp_search.php |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/upload/source/include/spacecp/spacecp_friend.php b/upload/source/include/spacecp/spacecp_friend.php
index 794943823..c55e77651 100644
--- a/upload/source/include/spacecp/spacecp_friend.php
+++ b/upload/source/include/spacecp/spacecp_friend.php
@@ -340,7 +340,7 @@ if($op == 'add') {
 	if($page<1) $page = 1;
 	$start = ($page-1)*$perpage;
 
-	$list = array();
+	$list = $ols = array();
 
 	$count = C::t('home_friend_request')->count_by_uid($space['uid']);
 	if($count) {
@@ -349,9 +349,16 @@ if($op == 'add') {
 			$fuids[$value['fuid']] = $value['fuid'];
 			$list[$value['fuid']] = $value;
 		}
+		if (!empty($fuids)) {
+			foreach(C::app()->session->fetch_all_by_uid($fuids) as $value) {
+				if(!$value['invisible']) {
+					$ols[$value['uid']] = 1;
+				}
+			}
+		}		
 	} else {
 
-		dsetcookie('promptstate_'.$space['uid'], $newprompt, 31536000);
+		dsetcookie('promptstate_'.$space['uid'], $space['newprompt'], 31536000);
 
 	}
 
diff --git a/upload/source/include/spacecp/spacecp_search.php b/upload/source/include/spacecp/spacecp_search.php
index 76e00a2dd..79efb76f1 100644
--- a/upload/source/include/spacecp/spacecp_search.php
+++ b/upload/source/include/spacecp/spacecp_search.php
@@ -84,7 +84,7 @@ if(!empty($_GET['searchsubmit']) || !empty($_GET['searchmode'])) {
 		$wherearr['profile'] = "sf.uid=s.uid";
 	}
 
-	$list = array();
+	$list = $ols = array();
 	if($wherearr) {
 
 		$space['friends'] = array();
@@ -101,6 +101,13 @@ if(!empty($_GET['searchsubmit']) || !empty($_GET['searchmode'])) {
 		foreach($list as $uid => $value) {
 			$list[$uid]['follow'] = isset($follows[$uid]) ? 1 : 0;
 		}
+		if (!empty($list)) {
+			foreach(C::app()->session->fetch_all_by_uid(array_keys($list)) as $value) {
+				if(!$value['invisible']) {
+					$ols[$value['uid']] = 1;
+				}
+			}
+		}		
 	}
 
 
-- 
Gitee