mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 00:55:23 +02:00
Code Issues Releases Wiki Activity

[ticket/11148] Always use the output of the mimetype guesser in get_mimetype

Browse Source 
PHPBB3-11148
This commit is contained in:
Marc Alexander 2014-06-01 00:19:22 +02:00
parent a402d619b4
commit 4eb7485b39
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_upload.php
View File

@ -231,12 +231,7 @@ class filespec
{ {
if ($this->mimetype_guesser !== null) if ($this->mimetype_guesser !== null)
{ {
$mimetype = $this->mimetype_guesser->guess($filename); $this->mimetype = $this->mimetype_guesser->guess($filename);
if ($mimetype !== 'application/octet-stream')
{
$this->mimetype = $mimetype;
}
} }
return $this->mimetype; return $this->mimetype;