From 51ad0907b4c11955107073e9050ad310ebb8c62f Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 1 Jun 2010 19:20:04 +0000 Subject: [PATCH] Fix bug 23688. Correct the mime type definitions for Microsoft Office 2007 OpenXML files. Original patch by Markus Krotzsch, adapted by me based on mime information found at: http://blogs.msdn.com/b/vsofficedeveloper/archive/2008/05/08/office-2007-open-xml-mime-types.aspx --- RELEASE-NOTES | 1 + includes/mime.types | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c69682da14..98520cdaeb 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -183,6 +183,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 8689) Long numeric lines no longer kill the parser. * (bug 23740) Article::doRedirect() now use $extraQuery parameter correctly if the $noRedir parameter is set to true +* (bug 23688) Correct mime types for Office 2007 OpenXML documents. === API changes in 1.17 === * (bug 22738) Allow filtering by action type on query=logevent. diff --git a/includes/mime.types b/includes/mime.types index a76dd8576d..ac3321d0c4 100644 --- a/includes/mime.types +++ b/includes/mime.types @@ -2,7 +2,7 @@ application/andrew-inset ez application/mac-binhex40 hqx application/mac-compactpro cpt application/mathml+xml mathml -application/msword doc docx docm dot dotx dotm +application/msword doc dot application/octet-stream bin dms lha lzh exe class so dll application/oda oda application/ogg ogx ogg ogm ogv oga spx @@ -13,8 +13,8 @@ application/smil smi smil application/srgs gram application/srgs+xml grxml application/vnd.mif mif -application/vnd.ms-excel xls xlsx xlsb xlam xltx xltm -application/vnd.ms-powerpoint ppt pptm pptx pot potx potm ppsm ppam +application/vnd.ms-excel xls xlt xla +application/vnd.ms-powerpoint ppt pot pps ppa application/vnd.wap.wbxml wbxml application/vnd.wap.wmlc wmlc application/vnd.wap.wmlscriptc wmlsc @@ -135,3 +135,20 @@ application/vnd.oasis.opendocument.formula odf application/vnd.oasis.opendocument.formula-template otf application/vnd.oasis.opendocument.text-master odm application/vnd.oasis.opendocument.text-web oth +application/vnd.openxmlformats-officedocument.wordprocessingml.document docx +application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx +application/vnd.ms-word.document.macroEnabled.12 docm +application/vnd.ms-word.template.macroEnabled.12 dotm +application/vnd.openxmlformats-officedocument.presentationml.template potx +application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx +application/vnd.openxmlformats-officedocument.presentationml.presentation pptx +application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam +application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm +application/vnd.ms-powerpoint.presentation.macroEnabled.12 potm +application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx +application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx +application/vnd.ms-excel.sheet.macroEnabled.12 xlsm +application/vnd.ms-excel.template.macroEnabled.12 xltm +application/vnd.ms-excel.addin.macroEnabled.12 xlam +application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb -- 2.20.1