aboutsummaryrefslogtreecommitdiffstats
path: root/include/group.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-14 21:08:00 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-14 21:08:00 -0700
commitbe0459a98b9c047e4cf89b835fd35a32da51ca31 (patch)
treebf4ddf3797fbd64b56853ac090361fb552ecfc6e /include/group.php
parentf0b255b1a9053e3983047354f0147225f2b29cd9 (diff)
downloadvolse-hubzilla-be0459a98b9c047e4cf89b835fd35a32da51ca31.tar.gz
volse-hubzilla-be0459a98b9c047e4cf89b835fd35a32da51ca31.tar.bz2
volse-hubzilla-be0459a98b9c047e4cf89b835fd35a32da51ca31.zip
convert the abook fields
Diffstat (limited to 'include/group.php')
-rw-r--r--include/group.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php
index a5e25fb76..81e9b98f2 100644
--- a/include/group.php
+++ b/include/group.php
@@ -200,12 +200,10 @@ 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 not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ",
+ 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 ",
intval($gid),
intval(local_channel()),
- intval(local_channel()),
- intval(ABOOK_FLAG_BLOCKED),
- intval(ABOOK_FLAG_PENDING)
+ intval(local_channel())
);
if(count($r))
$ret = $r;