diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-03 21:18:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-03 21:18:46 +0200 |
| commit | 5540a0f8e031d84114437f0d786712303fe76a88 (patch) | |
| tree | 41696c37f655c6931cbd01f6560ee03f69595d22 /phpBB | |
| parent | 730e1140e3ff9c11e008921632d99c5331591db3 (diff) | |
| parent | 3632a0f4f25113aa8d3c19b9a208df8e7c469925 (diff) | |
| download | forums-5540a0f8e031d84114437f0d786712303fe76a88.tar forums-5540a0f8e031d84114437f0d786712303fe76a88.tar.gz forums-5540a0f8e031d84114437f0d786712303fe76a88.tar.bz2 forums-5540a0f8e031d84114437f0d786712303fe76a88.tar.xz forums-5540a0f8e031d84114437f0d786712303fe76a88.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 5557ecc835..274aa97122 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1239,13 +1239,17 @@ class acp_attachments $display_cat = isset($extensions[$row['extension']]['display_cat']) ? $extensions[$row['extension']]['display_cat'] : ATTACHMENT_CATEGORY_NONE; $l_downloaded_viewed = ($display_cat == ATTACHMENT_CATEGORY_NONE) ? 'DOWNLOAD_COUNTS' : 'VIEWED_COUNTS'; + // Capitalises the group name and checks if its key exists in the language file + $up_group_name = utf8_strtoupper($extensions[$row['extension']]['group_name']); + $ext_group_name = (!empty($up_group_name)) ? (isset($user->lang['EXT_GROUP_' . $up_group_name]) ? $user->lang['EXT_GROUP_' . $up_group_name] : '') : ''; + $template->assign_block_vars('attachments', array( 'ATTACHMENT_POSTER' => get_username_string('full', (int) $row['poster_id'], (string) $row['username'], (string) $row['user_colour'], (string) $row['username']), 'FILESIZE' => get_formatted_filesize((int) $row['filesize']), 'FILETIME' => $user->format_date((int) $row['filetime']), 'REAL_FILENAME' => (!$row['in_message']) ? utf8_basename((string) $row['real_filename']) : '', 'PHYSICAL_FILENAME' => utf8_basename((string) $row['physical_filename']), - 'EXT_GROUP_NAME' => (!empty($extensions[$row['extension']]['group_name'])) ? $user->lang['EXT_GROUP_' . $extensions[$row['extension']]['group_name']] : '', + 'EXT_GROUP_NAME' => $ext_group_name, 'COMMENT' => $comment, 'TOPIC_TITLE' => (!$row['in_message']) ? (string) $row['topic_title'] : '', 'ATTACH_ID' => (int) $row['attach_id'], |