aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2015-05-28 17:31:21 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2015-08-05 17:50:24 +0200
commit185fbe41c954640a0aa5632b541055005ef776c2 (patch)
tree9119922e5408dd9821d06a8f512f79d88fc6d73b /phpBB/includes/acp/acp_users.php
parent4b3343e756be45ac1ca26e976ba79e6353f41de3 (diff)
downloadforums-185fbe41c954640a0aa5632b541055005ef776c2.tar
forums-185fbe41c954640a0aa5632b541055005ef776c2.tar.gz
forums-185fbe41c954640a0aa5632b541055005ef776c2.tar.bz2
forums-185fbe41c954640a0aa5632b541055005ef776c2.tar.xz
forums-185fbe41c954640a0aa5632b541055005ef776c2.zip
[ticket/12143] Replace group name output
So now we can use translated group names for non-special groups PHPBB3-12143
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 0ec17ccf0c..bbc8e73cb8 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -2348,6 +2348,9 @@ class acp_users
$error = array();
}
+ /** @var \phpbb\group\helper $group_helper */
+ $group_helper = $phpbb_container->get('group_helper');
+
$sql = 'SELECT ug.*, g.*
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug
WHERE ug.user_id = $user_id
@@ -2392,7 +2395,7 @@ class acp_users
continue;
}
- $s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($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'] . '">' . $group_helper->get_name($row['group_name']) . '</option>';
}
$db->sql_freeresult($result);