diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
| commit | 6892ba4cd8668ec48d036876d999ed9685165256 (patch) | |
| tree | 413576d1912df0fe6a9b5197d851659affca52ab /mod/group.php | |
| parent | 7972de13caf21647c8cc2e82c499a344f7191a22 (diff) | |
| parent | 5ad9b48f1d916425e41f475319c7237293d055b9 (diff) | |
| download | volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.gz volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.bz2 volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/group.php')
| -rw-r--r-- | mod/group.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/group.php b/mod/group.php index 7eaad771f..c63ccfa9b 100644 --- a/mod/group.php +++ b/mod/group.php @@ -117,7 +117,7 @@ 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 xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 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 abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1", dbesc(base64url_decode(argv(2))), intval(local_channel()) ); @@ -208,7 +208,7 @@ 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 abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 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 abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc", intval(local_channel()) ); |