diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2020-05-21 01:01:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2020-05-21 01:01:06 +0000 |
| commit | 3f2937810ec2b6861979c2138eda893a51983370 (patch) | |
| tree | f525851755209f400444b2bcac49a12e830098b2 /maintenance | |
| parent | 9ff8d6c96f6fad0b6d4f6325294ec6cc1de9de60 (diff) | |
| parent | cb44ddf85b09d48322f9326b948925b9e3022b92 (diff) | |
| download | mediawikicore-3f2937810ec2b6861979c2138eda893a51983370.tar.gz mediawikicore-3f2937810ec2b6861979c2138eda893a51983370.zip | |
Merge "mime: Convert built-in MIME mappings to PHP arrays"
Diffstat (limited to 'maintenance')
| -rw-r--r-- | maintenance/dev/includes/router.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/maintenance/dev/includes/router.php b/maintenance/dev/includes/router.php index bb600bf92fba..2bdc13e67f91 100644 --- a/maintenance/dev/includes/router.php +++ b/maintenance/dev/includes/router.php @@ -54,15 +54,13 @@ if ( $ext == 'php' ) { // The built-in server for PHP 7.0+ supports most files already // (contrary to PHP 5.2, which was supported when router.php was created). // But it still doesn't support as many MIME types as MediaWiki (e.g. ".json") + require_once __DIR__ . "/../../../includes/libs/mime/MimeMap.php"; // Fallback $mime = 'text/plain'; // Borrow from MimeAnalyzer - $lines = explode( "\n", file_get_contents( "includes/libs/mime/mime.types" ) ); - foreach ( $lines as $line ) { - $exts = explode( ' ', $line ); - $type = array_shift( $exts ); - if ( in_array( $ext, $exts ) ) { + foreach ( \Wikimedia\Mime\MimeMap::MIME_EXTENSIONS as $type => $exts ) { + if ( in_array( $ext, explode( ' ', $exts ) ) ) { $mime = $type; break; } |