From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Sun, 2 May 2010 19:40:33 +0000 (+0000)
Subject: (bug 23375) Added ogv, oga, spx as extensions for ogg files. Patch by Derk-Jan Hartman.
X-Git-Tag: 1.31.0-rc.0~36963
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=0a9762dd060d63aadc9e959de42e580ba7d2a08f;p=lhc%2Fweb%2Fwiklou.git

(bug 23375) Added ogv, oga, spx as extensions for ogg files. Patch by Derk-Jan Hartman.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3e398dbcad..a53c88dc56 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -141,6 +141,7 @@ in a negative namespace (which is invalid).
 * (bug 23298) Interwiki links with prefix only in log summaries now link to the
   correct link
 * (bug 23284) Times are now rounded correctly
+* (bug 23375) Added ogv, oga, spx as extensions for ogg 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 13a2aa471f..c0db54bbdc 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -9,7 +9,7 @@
  * the file mime.types in the includes directory.
  */
 define('MM_WELL_KNOWN_MIME_TYPES',<<<END_STRING
-application/ogg ogg ogm ogv
+application/ogg ogx ogg ogm ogv oga spx
 application/pdf pdf
 application/vnd.oasis.opendocument.chart odc
 application/vnd.oasis.opendocument.chart-template otc
@@ -33,7 +33,7 @@ audio/midi mid midi kar
 audio/mpeg mpga mpa mp2 mp3
 audio/x-aiff aif aiff aifc
 audio/x-wav wav
-audio/ogg ogg
+audio/ogg oga spx ogg
 image/x-bmp bmp
 image/gif gif
 image/jpeg jpeg jpg jpe
@@ -45,7 +45,7 @@ image/x-portable-pixmap ppm
 image/x-xcf xcf
 text/plain txt
 text/html html htm
-video/ogg ogm ogg ogv
+video/ogg ogv ogm ogg
 video/mpeg mpg mpeg
 END_STRING
 );
@@ -396,7 +396,7 @@ class MimeMagic {
 			'xbm',
 
 			// Formats we recognize magic numbers for
-			'djvu', 'ogg', 'ogv', 'mid', 'pdf', 'wmf', 'xcf',
+			'djvu', 'ogx', 'ogg', 'ogv', 'oga', 'spx', 'mid', 'pdf', 'wmf', 'xcf',
 
 			// XML formats we sure hope we recognize reliably
 			'svg',
diff --git a/includes/mime.info b/includes/mime.info
index a3a1467b65..9d8a3b04de 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -31,6 +31,7 @@ audio/mp3 audio/mpeg3 audio/mpeg	[AUDIO]
 audio/wav audio/x-wav audio/wave	[AUDIO]
 audio/midi audio/mid	[AUDIO]
 audio/basic		[AUDIO]
+audio/ogg		[AUDIO]
 audio/x-aiff		[AUDIO]
 audio/x-pn-realaudio	[AUDIO]
 audio/x-realaudio	[AUDIO]
diff --git a/includes/mime.types b/includes/mime.types
index 0294efe912..a76dd8576d 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -5,7 +5,7 @@ application/mathml+xml mathml
 application/msword doc docx docm dot dotx dotm
 application/octet-stream bin dms lha lzh exe class so dll
 application/oda oda
-application/ogg ogg ogm
+application/ogg ogx ogg ogm ogv oga spx
 application/pdf pdf
 application/postscript ai eps ps
 application/rdf+xml rdf
@@ -63,10 +63,10 @@ application/x-rar rar
 audio/basic au snd
 audio/midi mid midi kar
 audio/mpeg mpga mp2 mp3
-audio/ogg ogg
+audio/ogg oga ogg spx
 audio/x-aiff aif aiff aifc
 audio/x-mpegurl m3u
-audio/x-ogg ogg
+audio/x-ogg oga ogg spx
 audio/x-pn-realaudio ram rm
 audio/x-pn-realaudio-plugin rpm
 audio/x-realaudio ra
@@ -111,12 +111,12 @@ text/vnd.wap.wmlscript wmls
 text/xml xml xsl xslt rss rdf
 text/x-setext etx
 video/mpeg mpeg mpg mpe
-video/ogg ogm ogg
+video/ogg ogv ogm ogg
 video/quicktime qt mov
 video/vnd.mpegurl mxu
 video/x-flv flv
 video/x-msvideo avi
-video/x-ogg ogm ogg
+video/x-ogg ogv ogm ogg
 video/x-sgi-movie movie
 x-conference/x-cooltalk ice
 application/vnd.oasis.opendocument.text odt
@@ -134,4 +134,4 @@ application/vnd.oasis.opendocument.image-template oti
 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
\ No newline at end of file
+application/vnd.oasis.opendocument.text-web oth