From 0f7432055f9febd6f9ecba828f485877824793a7 Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Tue, 27 Apr 2021 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A5=E5=BF=97-?=
 =?UTF-8?q?=E5=8F=91=E8=A1=A8=E6=97=A5=E5=BF=97=20=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=8F=AF=E8=A7=81=E5=87=BA=E7=8E=B0=E6=97=A0?=
 =?UTF-8?q?=E6=9D=83=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/function/function_space.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/upload/source/function/function_space.php b/upload/source/function/function_space.php
index 4115ea46a..88a2d8c72 100644
--- a/upload/source/function/function_space.php
+++ b/upload/source/function/function_space.php
@@ -271,10 +271,8 @@ function getblockhtml($blockname,$parameters = array()) {
 						$data_blogfield = C::t('home_blogfield')->fetch_all($bids);
 					}
 					foreach($data_blog as $curblogid => $value) {
+						$value = array_merge($value, (array)$data_blogfield[$curblogid]);
 						if(ckfriend($value['uid'], $value['friend'], $value['target_ids'])) {
-							if($parameters['showmessage'] > 0) {
-								$value = array_merge($value, (array)$data_blogfield[$curblogid]);
-							}
 							if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']);
 							$value['message'] = $value['friend'] == 4 ? '' : getstr($value['message'], $parameters['showmessage'], 0, 0, 0, -1);
 							$html .= lang('space', 'blog_li', array(
@@ -312,8 +310,8 @@ function getblockhtml($blockname,$parameters = array()) {
 			$blogids = array_keys($data_blog);
 			$data_blogfield = C::t('home_blogfield')->fetch_all($blogids);
 			foreach($data_blog as $curblogid => $value) {
+				$value = array_merge($value, (array)$data_blogfield[$curblogid]);
 				if(ckfriend($value['uid'], $value['friend'], $value['target_ids'])) {
-					$value = array_merge($value, (array)$data_blogfield[$curblogid]);
 					if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']);
 					$value['message'] = $value['friend'] == 4 ? '' : getstr($value['message'], $parameters['showmessage'], 0, 0, 0, -1);
 					$html .= lang('space', 'blog_li', array(
-- 
Gitee