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_privmsgs.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_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index c8c2670986..7b6540cda7 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1436,7 +1436,10 @@ function rebuild_header($check_ary) */ function write_pm_addresses($check_ary, $author_id, $plaintext = false) { - global $db, $user, $template, $phpbb_root_path, $phpEx; + global $db, $user, $template, $phpbb_root_path, $phpEx, $phpbb_container; + + /** @var \phpbb\group\helper $group_helper */ + $group_helper = $phpbb_container->get('group_helper'); $addresses = array(); @@ -1497,7 +1500,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) { if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) { - $address[] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; + $address[] = $group_helper->get_name($row['group_name']); } } $db->sql_freeresult($result); @@ -1517,7 +1520,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) { if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) { - $row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; + $row['group_name'] = $group_helper->get_name($row['group_name']); $address['group'][$row['group_id']] = array('name' => $row['group_name'], 'colour' => $row['group_colour']); } } @@ -2178,7 +2181,10 @@ function phpbb_get_max_setting_from_group(\phpbb\db\driver\driver_interface $db, */ function get_recipient_strings($pm_by_id) { - global $db, $phpbb_root_path, $phpEx, $user; + global $db, $phpbb_root_path, $phpEx, $user, $phpbb_container; + + /** @var \phpbb\group\helper $group_helper */ + $group_helper = $phpbb_container->get('group_helper'); $address_list = $recipient_list = $address = array(); @@ -2224,7 +2230,7 @@ function get_recipient_strings($pm_by_id) { if ($ug_type == 'g') { - $row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name']; + $row['name'] = $group_helper->get_name($row['name']); } $recipient_list[$ug_type][$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']); |