aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2019-06-25 16:29:51 +0000
committerrubencm <rubencm@gmail.com>2019-06-25 16:29:51 +0000
commite0395fa2f2cd00624d5b3bde42961af3298ccf7f (patch)
tree6719a854d264117093621a54a7e8fb239989f7ee
parent191008daff2ea6a2df3fc8fbcd5f8c99fbee89ce (diff)
downloadforums-e0395fa2f2cd00624d5b3bde42961af3298ccf7f.tar
forums-e0395fa2f2cd00624d5b3bde42961af3298ccf7f.tar.gz
forums-e0395fa2f2cd00624d5b3bde42961af3298ccf7f.tar.bz2
forums-e0395fa2f2cd00624d5b3bde42961af3298ccf7f.tar.xz
forums-e0395fa2f2cd00624d5b3bde42961af3298ccf7f.zip
[ticket/14459] Uppercase string to try to match language keys
PHPBB3-14459
-rw-r--r--phpBB/includes/acp/acp_attachments.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 48db954891..93927544a8 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -132,7 +132,7 @@ class acp_attachments
$s_assigned_groups = array();
while ($row = $db->sql_fetchrow($result))
{
- $row['group_name'] = (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name'];
+ $row['group_name'] = (isset($user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])])) ? $user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])] : $row['group_name'];
$s_assigned_groups[$row['cat_id']][] = $row['group_name'];
}
$db->sql_freeresult($result);
@@ -577,7 +577,7 @@ class acp_attachments
$group_id = $db->sql_nextid();
}
- $group_name = (isset($user->lang['EXT_GROUP_' . $group_name])) ? $user->lang['EXT_GROUP_' . $group_name] : $group_name;
+ $group_name = (isset($user->lang['EXT_GROUP_' . utf8_strtoupper($group_name)])) ? $user->lang['EXT_GROUP_' . utf8_strtoupper($group_name)] : $group_name;
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), false, array($group_name));
}
@@ -879,7 +879,7 @@ class acp_attachments
'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$row['group_id']}",
'U_DELETE' => $this->u_action . "&amp;action=delete&amp;g={$row['group_id']}",
- 'GROUP_NAME' => (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name'],
+ 'GROUP_NAME' => (isset($user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])])) ? $user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])] : $row['group_name'],
'CATEGORY' => $cat_lang[$row['cat_id']],
)
);
@@ -1434,7 +1434,7 @@ class acp_attachments
$group_name = array();
while ($row = $db->sql_fetchrow($result))
{
- $row['group_name'] = (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name'];
+ $row['group_name'] = (isset($user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])])) ? $user->lang['EXT_GROUP_' . utf8_strtoupper($row['group_name'])] : $row['group_name'];
$group_name[] = $row;
}
$db->sql_freeresult($result);