diff options
| -rw-r--r-- | include/group.php | 3 | ||||
| -rw-r--r-- | mod/group.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index 4a7acf7c9..1a3ed669f 100644 --- a/include/group.php +++ b/include/group.php @@ -187,9 +187,10 @@ function group_get_members($gid) { if(intval($gid)) { $r = q("SELECT * FROM `group_member` LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan - WHERE `gid` = %d AND `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ", + WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ", intval($gid), intval(local_user()), + intval(local_user()), intval(ABOOK_FLAG_SELF), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) diff --git a/mod/group.php b/mod/group.php index 778ecbded..c85cb2da3 100644 --- a/mod/group.php +++ b/mod/group.php @@ -143,12 +143,14 @@ function group_content(&$a) { } $group = $r[0]; + $members = group_get_members($group['id']); $preselected = array(); if(count($members)) { foreach($members as $member) - $preselected[] = $member['xchan_hash']; + if(! in_array($member['xchan_hash'],$preselected)) + $preselected[] = $member['xchan_hash']; } if($change) { |