diff options
| author | friendica <info@friendica.com> | 2014-02-07 13:40:26 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-07 13:40:26 -0800 |
| commit | 1ec7ffc774a8ffd202b0ef522ba37b4d9311f564 (patch) | |
| tree | 25f51c6cc250c60d93fb90d6120f854987c62ef9 /include | |
| parent | 63589d4f2e05ec9bb2c8da193f566da512de5364 (diff) | |
| parent | a3c817870341dcbe6472e32147f0949d31b27071 (diff) | |
| download | volse-hubzilla-1ec7ffc774a8ffd202b0ef522ba37b4d9311f564.tar.gz volse-hubzilla-1ec7ffc774a8ffd202b0ef522ba37b4d9311f564.tar.bz2 volse-hubzilla-1ec7ffc774a8ffd202b0ef522ba37b4d9311f564.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/group.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index 56a7555bc..56f177ab0 100644 --- a/include/group.php +++ b/include/group.php @@ -188,11 +188,11 @@ 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 ( 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 ( xchan_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(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); |