diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:43:04 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:43:04 +0100 |
| commit | eff1d378ccb6e80b6011267c9ce73ab0a316522a (patch) | |
| tree | 62e49167e90340eca0e8c082af37a9ff326eefee /phpBB/includes/functions_posting.php | |
| parent | 5ea59ba3222965c824284a7f0d0648bbe12a7bec (diff) | |
| parent | c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458 (diff) | |
| download | forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.gz forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.bz2 forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.xz forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.zip | |
Merge branch 'develop-olympus' into develop
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 ad90c0c75f..74b5b405a1 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'])); } |