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 | |
| 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
| -rw-r--r-- | include/group.php | 4 | ||||
| -rw-r--r-- | mod/group.php | 8 |
2 files changed, 6 insertions, 6 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) ); diff --git a/mod/group.php b/mod/group.php index 66e5fbf8e..15e4ff2a3 100644 --- a/mod/group.php +++ b/mod/group.php @@ -117,10 +117,10 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", + $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", dbesc(argv(2)), intval(local_user()), - intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); @@ -210,10 +210,10 @@ function group_content(&$a) { group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); } - $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc", + $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc", intval(local_user()), intval(ABOOK_FLAG_BLOCKED), - intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_PENDING) ); |