mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Code Issues Releases Wiki Activity

[ticket/16888] Add the list of allowed files in the attachment tab

Browse Source 
Make sure we are checking both PMs and topics

PHPBB3-16888
This commit is contained in:
3D-I
2021-10-10 13:26:16 +02:00
parent 98f446df67
commit 9ca70432d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions_posting.php
View File

@ -820,7 +820,8 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a
global $template, $config, $phpbb_root_path, $phpEx, $user, $phpbb_dispatcher; global $template, $config, $phpbb_root_path, $phpEx, $user, $phpbb_dispatcher;
global $cache, $request; global $cache, $request;
$forum_id = $request->variable('f', 0); // $forum_id when FALSE check for PMs if INT then check for forum id (topics|posts)
$forum_id = $request->variable('f', 0) ? $request->variable('f', 0) : false;
$allowed_attachments = array_keys($cache->obtain_attach_extensions($forum_id)['_allowed_']); $allowed_attachments = array_keys($cache->obtain_attach_extensions($forum_id)['_allowed_']);
// Some default template variables // Some default template variables
@ -830,7 +831,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a
'FILESIZE' => $config['max_filesize'], 'FILESIZE' => $config['max_filesize'],
'FILE_COMMENT' => (isset($filename_data['filecomment'])) ? $filename_data['filecomment'] : '', 'FILE_COMMENT' => (isset($filename_data['filecomment'])) ? $filename_data['filecomment'] : '',
'MAX_ATTACHMENT_FILESIZE' => $config['max_filesize'] > 0 ? $user->lang('MAX_ATTACHMENT_FILESIZE', get_formatted_filesize($config['max_filesize'])) : '', 'MAX_ATTACHMENT_FILESIZE' => $config['max_filesize'] > 0 ? $user->lang('MAX_ATTACHMENT_FILESIZE', get_formatted_filesize($config['max_filesize'])) : '',
'ALLOWED_ATTACHMENTS' => implode(', ', $allowed_attachments), 'ALLOWED_ATTACHMENTS' => !empty($allowed_attachments) ? implode(', ', $allowed_attachments) : '',
)); ));
if (count($attachment_data)) if (count($attachment_data))