aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2019-06-21 23:32:22 +0000
committerrubencm <rubencm@gmail.com>2019-06-21 23:32:22 +0000
commitcaa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f (patch)
tree9b16c95ca151a490aa48e31a9b277285ac6c4eb3 /phpBB/includes/acp
parentcaf5ee42fdf2c359c38d24641e5f16f417130628 (diff)
downloadforums-caa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f.tar
forums-caa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f.tar.gz
forums-caa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f.tar.bz2
forums-caa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f.tar.xz
forums-caa767e5a81fbb71e336ba077bfd8e7f6bfc6b5f.zip
[ticket/14459] Fix template logic
PHPBB3-14459
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_attachments.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 94e36a26dc..72cb639185 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1244,16 +1244,13 @@ 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']);
-
$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']) : '',
+ 'REAL_FILENAME' => utf8_basename((string) $row['real_filename']),
'PHYSICAL_FILENAME' => utf8_basename((string) $row['physical_filename']),
- 'EXT_GROUP_NAME' => $this->lang->is_set('EXT_GROUP_' . $up_group_name) ? $this->lang->lang('EXT_GROUP_' . $up_group_name) : $extensions[$row['extension']]['group_name'],
+ 'EXT_GROUP_NAME' => $this->lang->is_set('EXT_GROUP_' . $extensions[$row['extension']]['group_name']) ? $this->lang->lang('EXT_GROUP_' . $extensions[$row['extension']]['group_name']) : $extensions[$row['extension']]['group_name'],
'COMMENT' => $comment,
'TOPIC_TITLE' => (!$row['in_message']) ? (string) $row['topic_title'] : '',
'ATTACH_ID' => (int) $row['attach_id'],