diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:17 +0200 |
| commit | 352b523889f17e836873e14c00637ec23f9a7eb7 (patch) | |
| tree | 13404137051a458519e5f45f9a9a6622dad78432 /phpBB/includes | |
| parent | 67e049b7ff8fe75a14a0c84e25d97a426e857aa1 (diff) | |
| parent | 519adb506073f4c3e2afd57e6ba1b6da4569e606 (diff) | |
| download | forums-352b523889f17e836873e14c00637ec23f9a7eb7.tar forums-352b523889f17e836873e14c00637ec23f9a7eb7.tar.gz forums-352b523889f17e836873e14c00637ec23f9a7eb7.tar.bz2 forums-352b523889f17e836873e14c00637ec23f9a7eb7.tar.xz forums-352b523889f17e836873e14c00637ec23f9a7eb7.zip | |
Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympus
* Marc/ticket/10851:
[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 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) { |