[ticket/15276] Use finfo to get mimetype

PHPBB3-15276
phpbb · Aug 9, 2017 · de37630 · de37630
1 parent 9c6026b
commit de37630
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php
@@ -274,6 +274,16 @@ public function file_size($path)
 	 */
 	public function file_mimetype($path)
 	{
-		return mime_content_type($this->root_path . $path);
+		if (class_exists('finfo'))
+		{
+			$finfo = new \finfo(FILEINFO_MIME_TYPE);
+			$mimetype = $finfo->file($this->root_path . $path);
+		}
+		else
+		{
+			$mimetype = mime_content_type($this->root_path . $path);
+		}
+
+		return $mimetype;
 	}
 }