Merge "Avoid Database::tableName in WikiExporter"

[lhc/web/wiklou.git] / includes / StreamFile.php

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 71113a8..04a4ca6 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -105,7 +105,6 @@ class StreamFile {
                                case 'png':
                                        return 'image/png';
                                case 'jpg':
-                                       return 'image/jpeg';
                                case 'jpeg':
                                        return 'image/jpeg';
                        }
@@ -113,7 +112,7 @@ class StreamFile {
                        return 'unknown/unknown';
                }
 
-               $magic = MimeMagic::singleton();
+               $magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer();
                // Use the extension only, rather than magic numbers, to avoid opening
                // up vulnerabilities due to uploads of files with allowed extensions
                // but disallowed types.