diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 22:42:18 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 22:42:18 +0200 |
| commit | f6a4843c6df3a9b0490eb3d273ebed7d04a89582 (patch) | |
| tree | b031ba516adf54d5d3764528e696651b02ceef92 /phpBB/includes/functions_admin.php | |
| parent | f56fe0ba8da2211d3947369e79952f294cffe7d6 (diff) | |
| parent | 25103698040977fd0d655d6e658157a07bb24990 (diff) | |
| download | forums-f6a4843c6df3a9b0490eb3d273ebed7d04a89582.tar forums-f6a4843c6df3a9b0490eb3d273ebed7d04a89582.tar.gz forums-f6a4843c6df3a9b0490eb3d273ebed7d04a89582.tar.bz2 forums-f6a4843c6df3a9b0490eb3d273ebed7d04a89582.tar.xz forums-f6a4843c6df3a9b0490eb3d273ebed7d04a89582.zip | |
Merge pull request #3652 from Elsensee/ticket/12143
[ticket/12143] Make it possible to use translated group names for non-special groups
* Elsensee/ticket/12143:
[ticket/12143] Fix tests after rebase
[ticket/12143] Avoid no output from get_group_name()
[ticket/12143] Fix those tests
[ticket/12143] Add some tests
[ticket/12143] Oops, fixed array index
[ticket/12143] Replace group name output
[ticket/12143] Add group helper class to translate groupnames
[ticket/12143] Add is_set method to language service
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 7ca1f621ff..cd8dcc2734 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -171,7 +171,10 @@ function size_select_options($size_compare) */ function group_select_options($group_id, $exclude_ids = false, $manage_founder = false) { - global $db, $user, $config; + global $db, $config, $phpbb_container; + + /** @var \phpbb\group\helper $group_helper */ + $group_helper = $phpbb_container->get('group_helper'); $exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : ''; $sql_and = (!$config['coppa_enable']) ? (($exclude_sql) ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : ''; @@ -189,7 +192,7 @@ function group_select_options($group_id, $exclude_ids = false, $manage_founder = while ($row = $db->sql_fetchrow($result)) { $selected = ($row['group_id'] == $group_id) ? ' selected="selected"' : ''; - $s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '"' . $selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; + $s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '"' . $selected . '>' . $group_helper->get_name($row['group_name']) . '</option>'; } $db->sql_freeresult($result); |