kopia lustrzana https://github.com/friendica/friendica
commit
d42fe4bf5a
|
@ -55,7 +55,7 @@ function nogroup_content(App $a)
|
|||
'about' => $contact_details['about'],
|
||||
'sparkle' => $sparkle,
|
||||
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
||||
'url' => $url,
|
||||
'url' => $rr['url'],
|
||||
'network' => network_to_name($rr['network'], $url),
|
||||
);
|
||||
}
|
||||
|
|
|
@ -477,12 +477,14 @@ class Contact extends BaseObject
|
|||
"SELECT COUNT(*) AS `total`
|
||||
FROM `contact`
|
||||
WHERE `uid` = %d
|
||||
AND `self` = 0
|
||||
AND NOT `self`
|
||||
AND NOT `blocked`
|
||||
AND NOT `pending`
|
||||
AND `id` NOT IN (
|
||||
SELECT DISTINCT(`contact-id`)
|
||||
FROM `group_member`
|
||||
WHERE `uid` = %d
|
||||
) ", intval($uid), intval($uid)
|
||||
)", intval($uid), intval($uid)
|
||||
);
|
||||
|
||||
return $r;
|
||||
|
@ -492,13 +494,13 @@ class Contact extends BaseObject
|
|||
"SELECT *
|
||||
FROM `contact`
|
||||
WHERE `uid` = %d
|
||||
AND `self` = 0
|
||||
AND NOT `self`
|
||||
AND NOT `blocked`
|
||||
AND NOT `pending`
|
||||
AND `id` NOT IN (
|
||||
SELECT DISTINCT(`contact-id`)
|
||||
FROM `group_member` WHERE `uid` = %d
|
||||
)
|
||||
AND `blocked` = 0
|
||||
AND `pending` = 0
|
||||
LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
|
||||
);
|
||||
return $r;
|
||||
|
|
Ładowanie…
Reference in New Issue