diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-04 22:32:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-05 10:56:06 +0200 |
| commit | d31ff51785f42e3de255722a32f098ab49d1489c (patch) | |
| tree | 9db9c8ed1852e099a0e1586abf618c2f0a326593 /phpBB/includes/functions_upload.php | |
| parent | 7de15bc54c14ce4fa74480f3894f9aec23dbcfba (diff) | |
| download | forums-d31ff51785f42e3de255722a32f098ab49d1489c.tar forums-d31ff51785f42e3de255722a32f098ab49d1489c.tar.gz forums-d31ff51785f42e3de255722a32f098ab49d1489c.tar.bz2 forums-d31ff51785f42e3de255722a32f098ab49d1489c.tar.xz forums-d31ff51785f42e3de255722a32f098ab49d1489c.zip | |
[ticket/13031] Guess with all mimetype guessers and pick best guess
PHPBB3-13031
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 ae04fe737c..f179b2fd70 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -232,9 +232,9 @@ class filespec { if ($this->mimetype_guesser !== null) { - $mimetype = $this->mimetype_guesser->guess($filename); + $mimetype = $this->mimetype_guesser->guess($filename, $this->uploadname); - if (empty($this->mimetype) || $mimetype !== 'application/octet-stream') + if ($mimetype !== 'application/octet-stream') { $this->mimetype = $mimetype; } |