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 /mod/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 'mod/group.php')
| -rw-r--r-- | mod/group.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mod/group.php b/mod/group.php index 66297d6ac..f3984f9c8 100644 --- a/mod/group.php +++ b/mod/group.php @@ -117,10 +117,9 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1", + $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1", dbesc(base64url_decode(argv(2))), intval(local_channel()), - intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); @@ -211,10 +210,9 @@ function group_content(&$a) { group_rmv_member(local_channel(),$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)>0 and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 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)>0 and xchan_deleted = 0 and not (abook_flags & %d)>0 order by xchan_name asc", intval(local_channel()), intval(ABOOK_FLAG_BLOCKED), - intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_PENDING) ); |