diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-02-25 23:59:57 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-02-25 23:59:57 +0100 |
| commit | 5ad9b48f1d916425e41f475319c7237293d055b9 (patch) | |
| tree | 7ea36af739f57c418f73739cd97a25211ee91184 | |
| parent | ea54987ca4c36623bbbb4923cf1e19e9650431ed (diff) | |
| download | volse-hubzilla-5ad9b48f1d916425e41f475319c7237293d055b9.tar.gz volse-hubzilla-5ad9b48f1d916425e41f475319c7237293d055b9.tar.bz2 volse-hubzilla-5ad9b48f1d916425e41f475319c7237293d055b9.zip | |
revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to be added to a privacy group.
| -rw-r--r-- | include/group.php | 2 | ||||
| -rw-r--r-- | mod/group.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/group.php b/include/group.php index bef008afd..22f221059 100644 --- a/include/group.php +++ b/include/group.php @@ -200,7 +200,7 @@ 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 xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", + WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", intval($gid), intval(local_channel()), intval(local_channel()) 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()) ); |