mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympus

Browse Source 
* Marc/ticket/10851:
  [ticket/10851] Set disallowed content to empty array if checking is disabled
This commit is contained in:
Joas Schilling
2014-04-05 10:00:17 +02:00
parent 67e049b7ff 519adb5060
commit 352b523889
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_posting.php
View File

@@ -394,6 +394,10 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
{ {
$upload->set_disallowed_content(explode('|', $config['mime_triggers'])); $upload->set_disallowed_content(explode('|', $config['mime_triggers']));
} }
else if (!$config['check_attachment_content'])
{
$upload->set_disallowed_content(array());
}
if (!$local) if (!$local)
{ {