| Index: trunk/phase3/includes/MimeMagic.php |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | * the file mime.types in the includes directory. |
| 11 | 11 | */ |
| 12 | 12 | define('MM_WELL_KNOWN_MIME_TYPES',<<<END_STRING |
| 13 | | -application/ogg ogg ogm ogv |
| | 13 | +application/ogg ogx ogg ogm ogv oga spx |
| 14 | 14 | application/pdf pdf |
| 15 | 15 | application/vnd.oasis.opendocument.chart odc |
| 16 | 16 | application/vnd.oasis.opendocument.chart-template otc |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | audio/mpeg mpga mpa mp2 mp3 |
| 35 | 35 | audio/x-aiff aif aiff aifc |
| 36 | 36 | audio/x-wav wav |
| 37 | | -audio/ogg ogg |
| | 37 | +audio/ogg oga spx ogg |
| 38 | 38 | image/x-bmp bmp |
| 39 | 39 | image/gif gif |
| 40 | 40 | image/jpeg jpeg jpg jpe |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | image/x-xcf xcf |
| 47 | 47 | text/plain txt |
| 48 | 48 | text/html html htm |
| 49 | | -video/ogg ogm ogg ogv |
| | 49 | +video/ogg ogv ogm ogg |
| 50 | 50 | video/mpeg mpg mpeg |
| 51 | 51 | END_STRING |
| 52 | 52 | ); |
| — | — | @@ -396,7 +396,7 @@ |
| 397 | 397 | 'xbm', |
| 398 | 398 | |
| 399 | 399 | // 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', |
| 401 | 401 | |
| 402 | 402 | // XML formats we sure hope we recognize reliably |
| 403 | 403 | 'svg', |
| Index: trunk/phase3/includes/mime.types |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | application/msword doc docx docm dot dotx dotm |
| 7 | 7 | application/octet-stream bin dms lha lzh exe class so dll |
| 8 | 8 | application/oda oda |
| 9 | | -application/ogg ogg ogm |
| | 9 | +application/ogg ogx ogg ogm ogv oga spx |
| 10 | 10 | application/pdf pdf |
| 11 | 11 | application/postscript ai eps ps |
| 12 | 12 | application/rdf+xml rdf |
| — | — | @@ -63,10 +63,10 @@ |
| 64 | 64 | audio/basic au snd |
| 65 | 65 | audio/midi mid midi kar |
| 66 | 66 | audio/mpeg mpga mp2 mp3 |
| 67 | | -audio/ogg ogg |
| | 67 | +audio/ogg oga ogg spx |
| 68 | 68 | audio/x-aiff aif aiff aifc |
| 69 | 69 | audio/x-mpegurl m3u |
| 70 | | -audio/x-ogg ogg |
| | 70 | +audio/x-ogg oga ogg spx |
| 71 | 71 | audio/x-pn-realaudio ram rm |
| 72 | 72 | audio/x-pn-realaudio-plugin rpm |
| 73 | 73 | audio/x-realaudio ra |
| — | — | @@ -111,12 +111,12 @@ |
| 112 | 112 | text/xml xml xsl xslt rss rdf |
| 113 | 113 | text/x-setext etx |
| 114 | 114 | video/mpeg mpeg mpg mpe |
| 115 | | -video/ogg ogm ogg |
| | 115 | +video/ogg ogv ogm ogg |
| 116 | 116 | video/quicktime qt mov |
| 117 | 117 | video/vnd.mpegurl mxu |
| 118 | 118 | video/x-flv flv |
| 119 | 119 | video/x-msvideo avi |
| 120 | | -video/x-ogg ogm ogg |
| | 120 | +video/x-ogg ogv ogm ogg |
| 121 | 121 | video/x-sgi-movie movie |
| 122 | 122 | x-conference/x-cooltalk ice |
| 123 | 123 | application/vnd.oasis.opendocument.text odt |
| — | — | @@ -134,4 +134,4 @@ |
| 135 | 135 | application/vnd.oasis.opendocument.formula odf |
| 136 | 136 | application/vnd.oasis.opendocument.formula-template otf |
| 137 | 137 | application/vnd.oasis.opendocument.text-master odm |
| 138 | | -application/vnd.oasis.opendocument.text-web oth |
| \ No newline at end of file |
| | 138 | +application/vnd.oasis.opendocument.text-web oth |
| Index: trunk/phase3/includes/mime.info |
| — | — | @@ -31,6 +31,7 @@ |
| 32 | 32 | audio/wav audio/x-wav audio/wave [AUDIO] |
| 33 | 33 | audio/midi audio/mid [AUDIO] |
| 34 | 34 | audio/basic [AUDIO] |
| | 35 | +audio/ogg [AUDIO] |
| 35 | 36 | audio/x-aiff [AUDIO] |
| 36 | 37 | audio/x-pn-realaudio [AUDIO] |
| 37 | 38 | audio/x-realaudio [AUDIO] |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -141,6 +141,7 @@ |
| 142 | 142 | * (bug 23298) Interwiki links with prefix only in log summaries now link to the |
| 143 | 143 | correct link |
| 144 | 144 | * (bug 23284) Times are now rounded correctly |
| | 145 | +* (bug 23375) Added ogv, oga, spx as extensions for ogg files |
| 145 | 146 | |
| 146 | 147 | === API changes in 1.17 === |
| 147 | 148 | * (bug 22738) Allow filtering by action type on query=logevent |