From 85529ed8ff8c3e7bcef75417d15c0d7e5f73623e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 21 Nov 2018 08:50:43 +0000 Subject: [PATCH] "viewcontacts" hadn't displayed the AP contacts --- mod/viewcontacts.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index f3d457e295..8b7acffbdc 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -68,8 +68,9 @@ function viewcontacts_content(App $a) $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive` - AND `network` IN ('%s', '%s', '%s')", + AND `network` IN ('%s', '%s', '%s', '%s')", intval($a->profile['uid']), + DBA::escape(Protocol::ACTIVITYPUB), DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS) @@ -82,9 +83,10 @@ function viewcontacts_content(App $a) $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive` - AND `network` IN ('%s', '%s', '%s') + AND `network` IN ('%s', '%s', '%s', '%s') ORDER BY `name` ASC LIMIT %d, %d", intval($a->profile['uid']), + DBA::escape(Protocol::ACTIVITYPUB), DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS),