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_upload.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_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index bd960a1076..f648c585f6 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -458,7 +458,7 @@ class fileerror extends filespec class fileupload { var $allowed_extensions = array(); - var $disallowed_content = array(); + var $disallowed_content = array('body', 'head', 'html', 'img', 'plaintext', 'a href', 'pre', 'script', 'table', 'title'); var $max_filesize = 0; var $min_width = 0; var $min_height = 0; @@ -539,7 +539,7 @@ class fileupload { if ($disallowed_content !== false && is_array($disallowed_content)) { - $this->disallowed_content = $disallowed_content; + $this->disallowed_content = array_diff($disallowed_content, array('')); } } |