From cadc2481055712fb1171272f05efd2dede9fdf0d Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 1 Apr 2010 23:27:49 +0000 Subject: [PATCH] (bug 22935) image/x-ms-bmp mime type added for BMP files --- RELEASE-NOTES | 3 ++- includes/MimeMagic.php | 2 +- includes/mime.info | 2 +- includes/mime.types | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a10caa98c0..5144907ab9 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -69,7 +69,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN anonymous users instead of null. * (bug 22627) Remove PHP notice when deleting a page only hidden users edited. * (bug 21520) Anonymous previews now also gives a warning about not being -logged in (anonpreviewwarning). + logged in (anonpreviewwarning). +* (bug 22935) image/x-ms-bmp mime type added for BMP files === API changes in 1.17 === * (bug 22738) Allow filtering by action type on query=logevent diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php index 39c82c9dc4..13a2aa471f 100644 --- a/includes/MimeMagic.php +++ b/includes/MimeMagic.php @@ -80,7 +80,7 @@ audio/x-aiff [AUDIO] audio/x-wav [AUDIO] audio/mp3 audio/mpeg [AUDIO] application/ogg audio/ogg video/ogg [MULTIMEDIA] -image/x-bmp image/bmp [BITMAP] +image/x-bmp image/x-ms-bmp image/bmp [BITMAP] image/gif [BITMAP] image/jpeg [BITMAP] image/png [BITMAP] diff --git a/includes/mime.info b/includes/mime.info index 63b38f5a8a..a3a1467b65 100644 --- a/includes/mime.info +++ b/includes/mime.info @@ -16,7 +16,7 @@ image/x-icon [BITMAP] image/x-rgb [BITMAP] image/x-portable-pixmap [BITMAP] image/x-portable-graymap image/x-portable-greymap [BITMAP] -image/x-bmp image/bmp application/x-bmp application/bmp [BITMAP] +image/x-bmp image/x-ms-bmp image/bmp application/x-bmp application/bmp [BITMAP] image/x-photoshop image/psd image/x-psd image/photoshop [BITMAP] image/vnd.djvu image/x.djvu image/x-djvu [BITMAP] diff --git a/includes/mime.types b/includes/mime.types index bd57cd40b5..53a7c13e78 100644 --- a/includes/mime.types +++ b/includes/mime.types @@ -85,6 +85,7 @@ image/vnd.djvu djvu djv image/vnd.wap.wbmp wbmp image/x-cmu-raster ras image/x-icon ico +image/x-ms-bmp image/x-portable-anymap pnm image/x-portable-bitmap pbm image/x-portable-graymap pgm -- 2.20.1