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/viewonline.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/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 2f58646722..a44a4b218e 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -182,6 +182,9 @@ $logged_visible_online = $logged_hidden_online = $counter = 0; /** @var \phpbb\controller\helper $controller_helper */ $controller_helper = $phpbb_container->get('controller.helper'); +/** @var \phpbb\group\helper $group_helper */ +$group_helper = $phpbb_container->get('group_helper'); + while ($row = $db->sql_fetchrow($result)) { if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) @@ -467,7 +470,7 @@ while ($row = $db->sql_fetchrow($result)) } else { - $legend .= (($legend != '') ? ', ' : '') . '<a style="color:#' . $row['group_colour'] . '" href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>'; + $legend .= (($legend != '') ? ', ' : '') . '<a style="color:#' . $row['group_colour'] . '" href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . $group_helper->get_name($row['group_name']) . '</a>'; } } $db->sql_freeresult($result); |