diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-04-04 11:48:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-04-04 11:48:17 +0200 |
| commit | e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723 (patch) | |
| tree | ea0b21938dc52a3725bb0f21bdfe951e69d8ec76 /phpBB/includes/functions_posting.php | |
| parent | d88929210acde66ce37e9b29edbf467abe8779df (diff) | |
| parent | 519adb506073f4c3e2afd57e6ba1b6da4569e606 (diff) | |
| download | forums-e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723.tar forums-e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723.tar.gz forums-e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723.tar.bz2 forums-e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723.tar.xz forums-e4e3df0b37ea6a67ba6c5b4cd98850e0d2758723.zip | |
Merge branch 'ticket/10851' into ticket/10851-ascraeus
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 8e9cc3a950..6a0aedf8c6 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -415,6 +415,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()); + } $filedata['post_attach'] = $local || $upload->is_valid($form_name); |