diff options
| author | MichaelC <m@michaelcullum.com> | 2017-11-26 22:12:19 +0000 |
|---|---|---|
| committer | MichaelC <m@michaelcullum.com> | 2017-11-26 22:12:19 +0000 |
| commit | b66b497429dfb1cc7a2ea56a022faf96c33d86dd (patch) | |
| tree | edba78f8edd599ed5cd7de404873f5b2a6ea6f65 /phpBB/includes | |
| parent | 6ed40857ed9dc530c92ffc9406b09c6f89321da6 (diff) | |
| parent | cb0e13aa19a07e3ab17fc265bf6a8765fd32f768 (diff) | |
| download | forums-b66b497429dfb1cc7a2ea56a022faf96c33d86dd.tar forums-b66b497429dfb1cc7a2ea56a022faf96c33d86dd.tar.gz forums-b66b497429dfb1cc7a2ea56a022faf96c33d86dd.tar.bz2 forums-b66b497429dfb1cc7a2ea56a022faf96c33d86dd.tar.xz forums-b66b497429dfb1cc7a2ea56a022faf96c33d86dd.zip | |
Merge remote-tracking branch 'rxu/ticket/15460' into 3.2.x
* rxu/ticket/15460:
[ticket/15460] Fix group name displayed in the manage users ACP module
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 090cb32ebb..beaa1d11f1 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2497,7 +2497,7 @@ class acp_users 'U_DELETE' => $this->u_action . "&action=delete&u=$user_id&g=" . $data['group_id'], 'U_APPROVE' => ($group_type == 'pending') ? $this->u_action . "&action=approve&u=$user_id&g=" . $data['group_id'] : '', - 'GROUP_NAME' => ($group_type == 'special') ? $user->lang['G_' . $data['group_name']] : $data['group_name'], + 'GROUP_NAME' => $group_helper->get_name($data['group_name']), 'L_DEMOTE_PROMOTE' => ($data['group_leader']) ? $user->lang['GROUP_DEMOTE'] : $user->lang['GROUP_PROMOTE'], 'S_IS_MEMBER' => ($group_type != 'pending') ? true : false, |