diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-03 23:06:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-03 23:09:17 +0200 |
| commit | 7de15bc54c14ce4fa74480f3894f9aec23dbcfba (patch) | |
| tree | 3abd6b22ed6239bb43e706ba24325b25ef83fb99 | |
| parent | 6777d462ffb5a45428fc1597e18663224c802af6 (diff) | |
| download | forums-7de15bc54c14ce4fa74480f3894f9aec23dbcfba.tar forums-7de15bc54c14ce4fa74480f3894f9aec23dbcfba.tar.gz forums-7de15bc54c14ce4fa74480f3894f9aec23dbcfba.tar.bz2 forums-7de15bc54c14ce4fa74480f3894f9aec23dbcfba.tar.xz forums-7de15bc54c14ce4fa74480f3894f9aec23dbcfba.zip | |
[ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.
PHPBB3-13031
| -rw-r--r-- | phpBB/includes/functions_upload.php | 7 | ||||
| -rw-r--r-- | tests/functional/fileupload_form_test.php | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index a0a67ccf3d..ae04fe737c 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -232,7 +232,12 @@ class filespec { if ($this->mimetype_guesser !== null) { - $this->mimetype = $this->mimetype_guesser->guess($filename); + $mimetype = $this->mimetype_guesser->guess($filename); + + if (empty($this->mimetype) || $mimetype !== 'application/octet-stream') + { + $this->mimetype = $mimetype; + } } return $this->mimetype; diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php index e87953367f..b8c48389e0 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -107,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case $crawler = $this->upload_file('disallowed.jpg', 'image/jpeg'); - // Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the + // Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the // DISALLOWED_CONTENT check - $this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text()); + $this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text()); } public function test_too_large() |