diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-06-01 00:19:22 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-23 21:39:24 +0200 |
| commit | 4eb7485b397733c8765f8bd37a04b7a034b29792 (patch) | |
| tree | edbdcf1f07169daf48c88ce3779acf0f8cbc9da6 /phpBB/includes/functions_upload.php | |
| parent | a402d619b458df69ae9c336f3324b357fcd1a52a (diff) | |
| download | forums-4eb7485b397733c8765f8bd37a04b7a034b29792.tar forums-4eb7485b397733c8765f8bd37a04b7a034b29792.tar.gz forums-4eb7485b397733c8765f8bd37a04b7a034b29792.tar.bz2 forums-4eb7485b397733c8765f8bd37a04b7a034b29792.tar.xz forums-4eb7485b397733c8765f8bd37a04b7a034b29792.zip | |
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
PHPBB3-11148
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 6ca430d9ac..f50ce9432f 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -231,12 +231,7 @@ class filespec { if ($this->mimetype_guesser !== null) { - $mimetype = $this->mimetype_guesser->guess($filename); - - if ($mimetype !== 'application/octet-stream') - { - $this->mimetype = $mimetype; - } + $this->mimetype = $this->mimetype_guesser->guess($filename); } return $this->mimetype; |