diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:42:41 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:42:41 +0100 |
| commit | c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458 (patch) | |
| tree | 0067ffed98002d41ad42d5328ca7dea990f69be2 /phpBB/includes/functions_posting.php | |
| parent | d7299f5071d461e6bf77df8c96b19bcd1bf027db (diff) | |
| parent | ac26bb458f2a2ea60848921826c69bfe03e676db (diff) | |
| download | forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.gz forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.bz2 forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.xz forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.zip | |
Merge branch 'ticket/bantu/9764' into develop-olympus
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 6fd87db663..72331a73c6 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -388,7 +388,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx); $upload = new fileupload(); - if ($config['check_attachment_content']) + if ($config['check_attachment_content'] && isset($config['mime_triggers'])) { $upload->set_disallowed_content(explode('|', $config['mime_triggers'])); } |