diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:40 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:40 +0200 |
| commit | 1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685 (patch) | |
| tree | 514fdf540b13e738d9352d849eef434d0561301c /phpBB/includes | |
| parent | ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c (diff) | |
| parent | fdfaba4607be827a63648c5103e84b96c8e85290 (diff) | |
| download | forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.gz forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.bz2 forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.xz forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.zip | |
Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeus
* Marc/ticket/10851-ascraeus:
[ticket/10851] Request index instead of logging in and out in tests
[ticket/10851] Add unit and functional tests for checking attachments
[ticket/10851] Set disallowed content to empty array if checking is disabled
Diffstat (limited to 'phpBB/includes')
| -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); |