diff options
| author | friendica <info@friendica.com> | 2014-02-08 08:00:55 +1100 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-08 08:00:55 +1100 |
| commit | a3c817870341dcbe6472e32147f0949d31b27071 (patch) | |
| tree | 3b19b8c3aa086e4931aac9790d298b2306f71ff7 /include | |
| parent | 6d1f211fab3880325f28ea5ac2f30142cef3e2e6 (diff) | |
| parent | 4c0f9a91b95025f08e3c4e2739cb5f4186726023 (diff) | |
| download | volse-hubzilla-a3c817870341dcbe6472e32147f0949d31b27071.tar.gz volse-hubzilla-a3c817870341dcbe6472e32147f0949d31b27071.tar.bz2 volse-hubzilla-a3c817870341dcbe6472e32147f0949d31b27071.zip | |
Merge pull request #304 from git-marijus/master
let oneself be added to a collection in exchange for deleted contacts
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) ); |