mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
This commit is contained in:
Tristan Darricau
2014-09-06 13:54:16 +02:00
parent bc38730ab5 6387bf8d13
commit e0711b417f
4 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_upload.php
View File

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