diff options
| author | battye <battye@phpbb.com> | 2018-11-29 14:37:14 +0000 |
|---|---|---|
| committer | battye <battye@phpbb.com> | 2018-11-29 14:37:14 +0000 |
| commit | 565f6925410b1022529670d47f3b00c244ccaed7 (patch) | |
| tree | 859989638a437578cd27723b36579de34b9e5978 /phpBB/includes/acp | |
| parent | 101829b4dce2874bbe53264c1769bf9699527c2f (diff) | |
| download | forums-565f6925410b1022529670d47f3b00c244ccaed7.tar forums-565f6925410b1022529670d47f3b00c244ccaed7.tar.gz forums-565f6925410b1022529670d47f3b00c244ccaed7.tar.bz2 forums-565f6925410b1022529670d47f3b00c244ccaed7.tar.xz forums-565f6925410b1022529670d47f3b00c244ccaed7.zip | |
[ticket/15883] Use the new language object
Using the new ->lang() format. Made the username
comparison case insensitive. Also fixed a bug where the return to
previous page link in the UCP was going back to the list of
groups rather than the specific manage group page when an error
occurred.
PHPBB3-15883
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 20f913ff29..f541025bf2 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -29,6 +29,9 @@ class acp_groups global $phpbb_root_path, $phpbb_admin_path, $phpEx; global $request, $phpbb_container, $phpbb_dispatcher; + /** @var \phpbb\language\language $language Language object */ + $language = $phpbb_container->get('language'); + $user->add_lang('acp/groups'); $this->tpl_name = 'acp_groups'; $this->page_title = 'ACP_GROUPS_MANAGE'; @@ -293,7 +296,7 @@ class acp_groups // Add user/s to group if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, $leader, 0, $group_row)) { - $display_message = $user->lang[$error]; + $display_message = $language->lang($error); if ($error == 'GROUP_USERS_INVALID') { @@ -302,7 +305,7 @@ class acp_groups $actual_user_id_ary = false; user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true); - $display_message = sprintf($user->lang['GROUP_USERS_INVALID'], implode($user->lang['COMMA_SEPARATOR'], array_diff($name_ary, $actual_name_ary))); + $display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp'))); } trigger_error($display_message . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); |