diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-04-03 15:55:18 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-04-03 16:06:46 +0200 |
| commit | 519adb506073f4c3e2afd57e6ba1b6da4569e606 (patch) | |
| tree | ced0ae0da1c2a300c12d8798eda55bd168d520f1 /phpBB/includes/functions_posting.php | |
| parent | 801a1f9ab9941e6d68f27591c55f26d02cceb90b (diff) | |
| download | forums-519adb506073f4c3e2afd57e6ba1b6da4569e606.tar forums-519adb506073f4c3e2afd57e6ba1b6da4569e606.tar.gz forums-519adb506073f4c3e2afd57e6ba1b6da4569e606.tar.bz2 forums-519adb506073f4c3e2afd57e6ba1b6da4569e606.tar.xz forums-519adb506073f4c3e2afd57e6ba1b6da4569e606.zip | |
[ticket/10851] Set disallowed content to empty array if checking is disabled
The disallowed content defaults to a standard set of mimetype triggers by
default. If one doesn't want to check the attachments mimetype triggers then
we need to set the disallowed content to an empty array.
PHPBB3-10851
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 11a5067ef9..3f0a78a7cb 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -394,6 +394,10 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage { $upload->set_disallowed_content(explode('|', $config['mime_triggers'])); } + else if (!$config['check_attachment_content']) + { + $upload->set_disallowed_content(array()); + } if (!$local) { |