r67196 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67195‎ | r67196 | r67197 >
Date:19:20, 1 June 2010
Author:hartman
Status:ok
Tags:
Comment:
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
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/mime.types (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/mime.types
@@ -2,7 +2,7 @@
33 application/mac-binhex40 hqx
44 application/mac-compactpro cpt
55 application/mathml+xml mathml
6 -application/msword doc docx docm dot dotx dotm
 6+application/msword doc dot
77 application/octet-stream bin dms lha lzh exe class so dll
88 application/oda oda
99 application/ogg ogx ogg ogm ogv oga spx
@@ -13,8 +13,8 @@
1414 application/srgs gram
1515 application/srgs+xml grxml
1616 application/vnd.mif mif
17 -application/vnd.ms-excel xls xlsx xlsb xlam xltx xltm
18 -application/vnd.ms-powerpoint ppt pptm pptx pot potx potm ppsm ppam
 17+application/vnd.ms-excel xls xlt xla
 18+application/vnd.ms-powerpoint ppt pot pps ppa
1919 application/vnd.wap.wbxml wbxml
2020 application/vnd.wap.wmlc wmlc
2121 application/vnd.wap.wmlscriptc wmlsc
@@ -135,3 +135,20 @@
136136 application/vnd.oasis.opendocument.formula-template otf
137137 application/vnd.oasis.opendocument.text-master odm
138138 application/vnd.oasis.opendocument.text-web oth
 139+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
 140+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
 141+application/vnd.ms-word.document.macroEnabled.12 docm
 142+application/vnd.ms-word.template.macroEnabled.12 dotm
 143+application/vnd.openxmlformats-officedocument.presentationml.template potx
 144+application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx
 145+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
 146+application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam
 147+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
 148+application/vnd.ms-powerpoint.presentation.macroEnabled.12 potm
 149+application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
 150+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
 151+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
 152+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
 153+application/vnd.ms-excel.template.macroEnabled.12 xltm
 154+application/vnd.ms-excel.addin.macroEnabled.12 xlam
 155+application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb
Index: trunk/phase3/RELEASE-NOTES
@@ -183,6 +183,7 @@
184184 * (bug 8689) Long numeric lines no longer kill the parser.
185185 * (bug 23740) Article::doRedirect() now use $extraQuery parameter correctly if
186186 the $noRedir parameter is set to true
 187+* (bug 23688) Correct mime types for Office 2007 OpenXML documents.
187188
188189 === API changes in 1.17 ===
189190 * (bug 22738) Allow filtering by action type on query=logevent.

Status & tagging log