mirror of
https://github.com/friendica/friendica
synced 2024-11-13 01:42:59 +00:00
Only show valid contacts on the group side
This commit is contained in:
parent
d9e56e0450
commit
1c5eaa646c
2 changed files with 16 additions and 15 deletions
|
@ -158,7 +158,9 @@ function group_get_members($gid) {
|
||||||
if(intval($gid)) {
|
if(intval($gid)) {
|
||||||
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
|
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
|
||||||
INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
|
INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
|
||||||
WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
|
WHERE `gid` = %d AND `group_member`.`uid` = %d AND
|
||||||
|
NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
|
||||||
|
ORDER BY `contact`.`name` ASC ",
|
||||||
intval($gid),
|
intval($gid),
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
);
|
);
|
||||||
|
|
|
@ -230,4 +230,3 @@ function group_content(&$a) {
|
||||||
return replace_macros($tpl, $context);
|
return replace_macros($tpl, $context);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue