aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2019-06-20 01:46:52 +0000
committerrubencm <rubencm@gmail.com>2019-06-20 01:46:52 +0000
commitcaf5ee42fdf2c359c38d24641e5f16f417130628 (patch)
tree4cfe0785b2991680dbe60d583e9cb01f4c88c533 /phpBB/includes/acp
parentd0b50b9ca11f014466ba6e8c0f427cc471b4e833 (diff)
downloadforums-caf5ee42fdf2c359c38d24641e5f16f417130628.tar
forums-caf5ee42fdf2c359c38d24641e5f16f417130628.tar.gz
forums-caf5ee42fdf2c359c38d24641e5f16f417130628.tar.bz2
forums-caf5ee42fdf2c359c38d24641e5f16f417130628.tar.xz
forums-caf5ee42fdf2c359c38d24641e5f16f417130628.zip
[ticket/14459] Fix rebase
PHPBB3-14459
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_attachments.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index feb1e405e4..94e36a26dc 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1253,7 +1253,6 @@ class acp_attachments
'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' => $ext_group_name,
'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'],
'COMMENT' => $comment,
'TOPIC_TITLE' => (!$row['in_message']) ? (string) $row['topic_title'] : '',