diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-02 22:32:50 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-02 22:32:50 -0400 |
| commit | b93e398674b375a3b14718fc6dd2a815aad9b387 (patch) | |
| tree | 7c2a8097e1c90a87cc8207b5fe08a064f4fa3ae8 /include/acl_selectors.php | |
| parent | b70c6809648bb3c78e5e26f9293727b3a7aa4025 (diff) | |
| parent | f9075e2a2feca0f37fdf568be6e6e53460aa9034 (diff) | |
| download | volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.tar.gz volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.tar.bz2 volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 54ea0304b..89d054e3b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -15,7 +15,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n"; - $r = q("SELECT * FROM `groups` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", + $r = q("SELECT * FROM `groups` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `gname` ASC", intval(local_channel()) ); @@ -32,7 +32,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $selected = " selected=\"selected\" "; else $selected = ''; - $trimmed = mb_substr($rr['name'],0,12); + $trimmed = mb_substr($rr['gname'],0,12); $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n"; } |