keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3983 from annando/nogroup

Browse source 
Small fixes to "nogroup"
This commit is contained in:
Hypolite Petovan 2017-11-29 16:07:27 -05:00 committed by GitHub
commit d42fe4bf5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/nogroup.php
View file

@ -55,7 +55,7 @@ function nogroup_content(App $a)
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
'url' => $url, 'url' => $rr['url'],
'network' => network_to_name($rr['network'], $url), 'network' => network_to_name($rr['network'], $url),
); );
} }

10
src/Object/Contact.php
View file

@ -477,7 +477,9 @@ class Contact extends BaseObject
"SELECT COUNT(*) AS `total` "SELECT COUNT(*) AS `total`
FROM `contact` FROM `contact`
WHERE `uid` = %d WHERE `uid` = %d
AND `self` = 0 AND NOT `self`
AND NOT `blocked`
AND NOT `pending`
AND `id` NOT IN ( AND `id` NOT IN (
SELECT DISTINCT(`contact-id`) SELECT DISTINCT(`contact-id`)
FROM `group_member` FROM `group_member`
@ -492,13 +494,13 @@ class Contact extends BaseObject
"SELECT * "SELECT *
FROM `contact` FROM `contact`
WHERE `uid` = %d WHERE `uid` = %d
AND `self` = 0 AND NOT `self`
AND NOT `blocked`
AND NOT `pending`
AND `id` NOT IN ( AND `id` NOT IN (
SELECT DISTINCT(`contact-id`) SELECT DISTINCT(`contact-id`)
FROM `group_member` WHERE `uid` = %d FROM `group_member` WHERE `uid` = %d
) )
AND `blocked` = 0
AND `pending` = 0
LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count) LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
); );
return $r; return $r;