diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-01 09:15:56 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-01 09:15:56 +0200 |
| commit | c1039977f1d64611d2c793f3aded96d031b74183 (patch) | |
| tree | fa32a8f59c863564998cd149a902388dd363d605 /Zotlabs/Module/Acl.php | |
| parent | 316fee93f7f7df92db514de961b74a71556fdb63 (diff) | |
| parent | b1259876bf398880e7b0c1b44d90f94983243e72 (diff) | |
| download | volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.gz volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.bz2 volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 62ac29286..7bc197a93 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -53,13 +53,13 @@ class Acl extends \Zotlabs\Web\Controller { if ($type=='' || $type=='g'){ - $r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name` + $r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`gname` FROM `groups`,`group_member` WHERE `groups`.`deleted` = 0 AND `groups`.`uid` = %d AND `group_member`.`gid`=`groups`.`id` $sql_extra GROUP BY `groups`.`id` - ORDER BY `groups`.`name` + ORDER BY `groups`.`gname` LIMIT %d OFFSET %d", intval(local_channel()), intval($count), @@ -67,11 +67,11 @@ class Acl extends \Zotlabs\Web\Controller { ); foreach($r as $g){ - // logger('acl: group: ' . $g['name'] . ' members: ' . group_get_members_xchan($g['id'])); + // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id'])); $groups[] = array( "type" => "g", "photo" => "images/twopeople.png", - "name" => $g['name'], + "name" => $g['gname'], "id" => $g['id'], "xid" => $g['hash'], "uids" => group_get_members_xchan($g['id']), |