diff options
| author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
| commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
| tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /include/group.php | |
| parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip | |
Merge branch 'master' into pocorate
Diffstat (limited to 'include/group.php')
| -rw-r--r-- | include/group.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php index 28cf5d80d..be19f6efe 100644 --- a/include/group.php +++ b/include/group.php @@ -202,8 +202,8 @@ function group_get_members($gid) { 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 not ( xchan_flags & %d )>0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ", intval($gid), - intval(local_user()), - intval(local_user()), + intval(local_channel()), + intval(local_channel()), intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) @@ -245,7 +245,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id $o = ''; - if(! local_user()) + if(! local_channel()) return ''; $groups = array(); @@ -263,7 +263,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id ); $member_of = array(); if($cid) { - $member_of = groups_containing(local_user(),$cid); + $member_of = groups_containing(local_channel(),$cid); } if(count($r)) { |