diff options
| author | friendica <info@friendica.com> | 2015-01-20 19:33:19 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-20 19:33:19 -0800 |
| commit | 51848c619080e19cace647966a17eb9a1b42ca25 (patch) | |
| tree | 6aee6c9487813051801cabbd2a4914528232d5b5 /mod/group.php | |
| parent | ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b (diff) | |
| download | volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.tar.gz volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.tar.bz2 volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.zip | |
working through the xchan table to remove bitfields, mostly complete except for updating the updater
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 f67623a83..36c31e355 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_user()), - intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); @@ -211,10 +210,9 @@ 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)>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_user()), intval(ABOOK_FLAG_BLOCKED), - intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_PENDING) ); |