mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-05 22:14:59 +02:00
[ticket/16888] Add the list of allowed files in the attachment tab
PHPBB3-16888
This commit is contained in:
parent
96c439bf10
commit
c5814ddfaa
phpBB
@ -817,11 +817,11 @@ function posting_gen_inline_attachments(&$attachment_data)
|
|||||||
*
|
*
|
||||||
* @param array $attachment_data The attachment data
|
* @param array $attachment_data The attachment data
|
||||||
* @param string $filename_data The filename data (filecomment)
|
* @param string $filename_data The filename data (filecomment)
|
||||||
* @param mixed $forum_id The forum id to check or false if private message
|
|
||||||
* @param bool $show_attach_box Whether to show the attach box
|
* @param bool $show_attach_box Whether to show the attach box
|
||||||
|
* @param mixed $forum_id The forum id to check or false if private message
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
function posting_gen_attachment_entry($attachment_data, &$filename_data, $forum_id, $show_attach_box = true)
|
function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_attach_box = true, $forum_id = false)
|
||||||
{
|
{
|
||||||
global $template, $cache, $config, $phpbb_root_path, $phpEx, $user, $phpbb_dispatcher;
|
global $template, $cache, $config, $phpbb_root_path, $phpEx, $user, $phpbb_dispatcher;
|
||||||
|
|
||||||
|
@ -1390,7 +1390,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Attachment entry
|
// Attachment entry
|
||||||
posting_gen_attachment_entry($attachment_data, $filename_data, false, $allowed);
|
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
|
||||||
|
|
||||||
// Message History
|
// Message History
|
||||||
if ($action == 'reply' || $action == 'quote' || $action == 'forward')
|
if ($action == 'reply' || $action == 'quote' || $action == 'forward')
|
||||||
|
@ -2078,7 +2078,7 @@ if ($allowed)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Attachment entry
|
// Attachment entry
|
||||||
posting_gen_attachment_entry($attachment_data, $filename_data, $forum_id, $allowed);
|
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed, $forum_id);
|
||||||
|
|
||||||
// Output page ...
|
// Output page ...
|
||||||
page_header($page_title);
|
page_header($page_title);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user