diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
| commit | 51db7536380d70e2047aa91c3a12809cc3444aa8 (patch) | |
| tree | 359c67869e57a5c42aed637f63c2dd7953bddbb7 /include/group.php | |
| parent | e271035879660bc9996101f3a23d61c88ecd5f53 (diff) | |
| parent | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff) | |
| download | volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2 volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip | |
Merge branch 'tres'
Diffstat (limited to 'include/group.php')
| -rw-r--r-- | include/group.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index fe55ec23f..2e064473c 100644 --- a/include/group.php +++ b/include/group.php @@ -200,11 +200,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 abook_channel = %d and `group_member`.`uid` = %d and not ( xchan_flags & %d )>0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ", + WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ", intval($gid), intval(local_channel()), intval(local_channel()), - intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); |