aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_attachments.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-05 16:51:29 -0700
committerCesar G <prototech91@gmail.com>2014-05-05 16:51:29 -0700
commit71379c3a0f32b57d9d7c73dda7a98edea0ce6736 (patch)
treef0b19a9f23c40ef8cacd4362d5daf12878022874 /phpBB/includes/acp/acp_attachments.php
parent698d8551cf6a101c6de4fcada85d1aed64b3ba78 (diff)
parent0e0eca2d2e82cba0fc04562a6d3f227c0fdec031 (diff)
downloadforums-71379c3a0f32b57d9d7c73dda7a98edea0ce6736.tar
forums-71379c3a0f32b57d9d7c73dda7a98edea0ce6736.tar.gz
forums-71379c3a0f32b57d9d7c73dda7a98edea0ce6736.tar.bz2
forums-71379c3a0f32b57d9d7c73dda7a98edea0ce6736.tar.xz
forums-71379c3a0f32b57d9d7c73dda7a98edea0ce6736.zip
Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus
* VSEphpbb/ticket/12332: [ticket/12332] Add missing semicolon to inline styling [ticket/12332] Adjust size of mark column where too wide [ticket/12332] Adjust column widths for responsive changes [ticket/12332] Restore some changes back to original state [ticket/12332] Add break-word to fixed width table CSS [ticket/12332] Accomplish all word creaking in template and CSS [ticket/12332] Remove width sizing, as it is already set [ticket/12332] Fix displaying attachments with long file names
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
-rw-r--r--phpBB/includes/acp/acp_attachments.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 1aaf1f9c09..03d3e0f85f 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1222,7 +1222,7 @@ class acp_attachments
'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_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true) : '',
+ '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']] : '',
'COMMENT' => $comment,