X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget%2FContactBlock.php;h=751aa921784edb873b26442ac16e3b531934b2d6;hb=58215e56c329f6cbcbe10575bb0b9ef709b2f093;hp=47fac09a83aeb292476f7e0ac0077b4479ff36d1;hpb=097620b62799c96d610d73410ec07a6b8cdf82f0;p=friendica.git

diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index 47fac09a83..751aa92178 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -44,10 +44,16 @@ class ContactBlock
 	 * @hook contact_block_end (contacts=>array, output=>string)
 	 * @return string
 	 */
-	public static function getHTML(array $profile)
+	public static function getHTML(array $profile, int $visitor_uid = null)
 	{
 		$o = '';
 
+		if (is_null($visitor_uid) || ($visitor_uid == $profile['uid'])) {
+			$contact_uid = $profile['uid'];
+		} else {
+			$contact_uid = 0;
+		}
+
 		$shown = DI::pConfig()->get($profile['uid'], 'system', 'display_friend_count', 24);
 		if ($shown == 0) {
 			return $o;
@@ -66,6 +72,7 @@ class ContactBlock
 			'pending' => false,
 			'hidden' => false,
 			'archive' => false,
+			'failed' => false,
 			'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::FEED],
 		]);
 
@@ -81,7 +88,7 @@ class ContactBlock
 				$rel = [Contact::FOLLOWER, Contact::FRIEND];
 			}
 
-			$contact_ids_stmt = DBA::select('contact', ['id'], [
+			$personal_contacts = DBA::selectToArray('contact', ['uri-id'], [
 				'uid' => $profile['uid'],
 				'self' => false,
 				'blocked' => false,
@@ -92,13 +99,10 @@ class ContactBlock
 				'network' => Protocol::FEDERATED,
 			], ['limit' => $shown]);
 
-			if (DBA::isResult($contact_ids_stmt)) {
-				$contact_ids = [];
-				while($contact = DBA::fetch($contact_ids_stmt)) {
-					$contact_ids[] = $contact["id"];
-				}
+			$contact_uriids = array_column($personal_contacts, 'uri-id');
 
-				$contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'network'], ['id' => $contact_ids]);
+			if (!empty($contact_uriids)) {
+				$contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['uri-id' => $contact_uriids, 'uid' => $contact_uid]);
 
 				if (DBA::isResult($contacts_stmt)) {
 					$contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total);
@@ -112,8 +116,6 @@ class ContactBlock
 
 				DBA::close($contacts_stmt);
 			}
-
-			DBA::close($contact_ids_stmt);
 		}
 
 		$tpl = Renderer::getMarkupTemplate('widget/contacts.tpl');