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 /include/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 'include/group.php')
| -rw-r--r-- | include/group.php | 2 |
1 files changed, 1 insertions, 1 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()) |