r65931 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r65930‎ | r65931 | r65932 >
Date:01:47, 5 May 2010
Author:tstarling
Status:ok
Tags:
Comment:
MFT r64509, r65650, r65816, fix .bmp and .oga MIME type detection
Modified paths:
  • /branches/wmf/1.16wmf4 (modified) (history)
  • /branches/wmf/1.16wmf4/RELEASE-NOTES (modified) (history)
  • /branches/wmf/1.16wmf4/includes (modified) (history)
  • /branches/wmf/1.16wmf4/includes/MimeMagic.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/mime.info (modified) (history)
  • /branches/wmf/1.16wmf4/includes/mime.types (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/includes/MimeMagic.php
——@@ -9,7 +9,7 @@
1010 * the file mime.types in the includes directory.
1111 */
1212 define('MM_WELL_KNOWN_MIME_TYPES',<<<END_STRING
13 -application/ogg ogg ogm ogv
 13+application/ogg ogx ogg ogm ogv oga spx
1414 application/pdf pdf
1515 application/vnd.oasis.opendocument.chart odc
1616 application/vnd.oasis.opendocument.chart-template otc
——@@ -33,7 +33,7 @@
3434 audio/mpeg mpga mpa mp2 mp3
3535 audio/x-aiff aif aiff aifc
3636 audio/x-wav wav
37 -audio/ogg ogg
 37+audio/ogg oga spx ogg
3838 image/x-bmp bmp
3939 image/gif gif
4040 image/jpeg jpeg jpg jpe
——@@ -45,7 +45,7 @@
4646 image/x-xcf xcf
4747 text/plain txt
4848 text/html html htm
49 -video/ogg ogm ogg ogv
 49+video/ogg ogv ogm ogg
5050 video/mpeg mpg mpeg
5151 END_STRING
5252 );
——@@ -80,7 +80,7 @@
8181 audio/x-wav [AUDIO]
8282 audio/mp3 audio/mpeg [AUDIO]
8383 application/ogg audio/ogg video/ogg [MULTIMEDIA]
84 -image/x-bmp image/bmp [BITMAP]
 84+image/x-bmp image/x-ms-bmp image/bmp [BITMAP]
8585 image/gif [BITMAP]
8686 image/jpeg [BITMAP]
8787 image/png [BITMAP]
——@@ -396,7 +396,7 @@
397397 'xbm',
398398
399399 // Formats we recognize magic numbers for
400 - 'djvu', 'ogg', 'ogv', 'mid', 'pdf', 'wmf', 'xcf',
 400+ 'djvu', 'ogx', 'ogg', 'ogv', 'oga', 'spx', 'mid', 'pdf', 'wmf', 'xcf',
401401
402402 // XML formats we sure hope we recognize reliably
403403 'svg',
Index: branches/wmf/1.16wmf4/includes/mime.types
——@@ -5,7 +5,7 @@
66 application/msword doc docx docm dot dotx dotm
77 application/octet-stream bin dms lha lzh exe class so dll
88 application/oda oda
9 -application/ogg ogg ogm
 9+application/ogg ogx ogg ogm ogv oga spx
1010 application/pdf pdf
1111 application/postscript ai eps ps
1212 application/rdf+xml rdf
——@@ -63,10 +63,10 @@
6464 audio/basic au snd
6565 audio/midi mid midi kar
6666 audio/mpeg mpga mp2 mp3
67 -audio/ogg ogg
 67+audio/ogg oga ogg spx
6868 audio/x-aiff aif aiff aifc
6969 audio/x-mpegurl m3u
70 -audio/x-ogg ogg
 70+audio/x-ogg oga ogg spx
7171 audio/x-pn-realaudio ram rm
7272 audio/x-pn-realaudio-plugin rpm
7373 audio/x-realaudio ra
——@@ -85,6 +85,7 @@
8686 image/vnd.wap.wbmp wbmp
8787 image/x-cmu-raster ras
8888 image/x-icon ico
 89+image/x-ms-bmp bmp
8990 image/x-portable-anymap pnm
9091 image/x-portable-bitmap pbm
9192 image/x-portable-graymap pgm
——@@ -110,12 +111,12 @@
111112 text/xml xml xsl xslt rss rdf
112113 text/x-setext etx
113114 video/mpeg mpeg mpg mpe
114 -video/ogg ogm ogg
 115+video/ogg ogv ogm ogg
115116 video/quicktime qt mov
116117 video/vnd.mpegurl mxu
117118 video/x-flv flv
118119 video/x-msvideo avi
119 -video/x-ogg ogm ogg
 120+video/x-ogg ogv ogm ogg
120121 video/x-sgi-movie movie
121122 x-conference/x-cooltalk ice
122123 application/vnd.oasis.opendocument.text odt
——@@ -133,4 +134,4 @@
134135 application/vnd.oasis.opendocument.formula odf
135136 application/vnd.oasis.opendocument.formula-template otf
136137 application/vnd.oasis.opendocument.text-master odm
137 -application/vnd.oasis.opendocument.text-web oth
\ No newline at end of file
 138+application/vnd.oasis.opendocument.text-web oth
Index: branches/wmf/1.16wmf4/includes/mime.info
——@@ -16,7 +16,7 @@
1717 image/x-rgb [BITMAP]
1818 image/x-portable-pixmap [BITMAP]
1919 image/x-portable-graymap image/x-portable-greymap [BITMAP]
20 -image/x-bmp image/bmp application/x-bmp application/bmp [BITMAP]
 20+image/x-bmp image/x-ms-bmp image/bmp application/x-bmp application/bmp [BITMAP]
2121 image/x-photoshop image/psd image/x-psd image/photoshop [BITMAP]
2222 image/vnd.djvu image/x.djvu image/x-djvu [BITMAP]
2323
——@@ -31,6 +31,7 @@
3232 audio/wav audio/x-wav audio/wave [AUDIO]
3333 audio/midi audio/mid [AUDIO]
3434 audio/basic [AUDIO]
 35+audio/ogg [AUDIO]
3536 audio/x-aiff [AUDIO]
3637 audio/x-pn-realaudio [AUDIO]
3738 audio/x-realaudio [AUDIO]
Property changes on: branches/wmf/1.16wmf4/includes
___________________________________________________________________
Name: svn:mergeinfo
3839 - /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901
3940 + /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901,64509,65650,65816
Index: branches/wmf/1.16wmf4/RELEASE-NOTES
——@@ -791,6 +791,7 @@
792792 the page set in the &returnto parameter.
793793 * (bug 19194) Search box in Modern skin doesn't focus with Safari/Chrome
794794 * (bug 17790) Users instantly logged off on HughesNet
 795+* (bug 23375) Added ogv, oga, spx as extensions for ogg files
795796
796797 == API changes in 1.16 ==
797798
Property changes on: branches/wmf/1.16wmf4
___________________________________________________________________
Name: svn:mergeinfo
798799 - /branches/wmf-deployment:60970
/trunk/phase3:63545-63546,63549,63643,63764,63897-63901
799800 + /branches/wmf-deployment:60970
/trunk/phase3:63545-63546,63549,63643,63764,63897-63901,64509,65650,65816

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r64509(bug 22935) image/x-ms-bmp mime type added for BMP filesdemon23:27, 1 April 2010
r65650Followup r64509, need bmp after image/x-ms-bmpdemon10:24, 29 April 2010
r65816(bug 23375) Added ogv, oga, spx as extensions for ogg files. Patch by Derk-Ja...btongminh19:40, 2 May 2010

Status & tagging log