bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6178 from annando/ap-viewcontacts

Browse source 
"viewcontacts" hadn't displayed the AP contacts
This commit is contained in:
Hypolite Petovan 2018-11-21 08:06:54 -05:00 committed by GitHub
parent a25df1a9c1 85529ed8ff
commit 117c0f6c13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/viewcontacts.php
View file

@ -68,8 +68,9 @@ function viewcontacts_content(App $a)
$r = q("SELECT COUNT(*) AS `total` FROM `contact` $r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
AND NOT `hidden` AND NOT `archive` AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s')", AND `network` IN ('%s', '%s', '%s', '%s')",
intval($a->profile['uid']), intval($a->profile['uid']),
DBA::escape(Protocol::ACTIVITYPUB),
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DFRN),
DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::OSTATUS) DBA::escape(Protocol::OSTATUS)
@ -82,9 +83,10 @@ function viewcontacts_content(App $a)
$r = q("SELECT * FROM `contact` $r = q("SELECT * FROM `contact`
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
AND NOT `hidden` AND NOT `archive` 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", ORDER BY `name` ASC LIMIT %d, %d",
intval($a->profile['uid']), intval($a->profile['uid']),
DBA::escape(Protocol::ACTIVITYPUB),
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DFRN),
DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::OSTATUS), DBA::escape(Protocol::OSTATUS),