r35978 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r35977‎ | r35978 | r35979 >
Date:19:58, 6 June 2008
Author:brion
Status:old
Tags:
Comment:
Add 'ogv' as recognized alias to 'ogg', allowing uploads of .ogv files to proceed if allowed
Modified paths:
  • /trunk/phase3/includes/MimeMagic.php (modified) (history)
  • /trunk/phase3/includes/filerepo/File.php (modified) (history)

Diff [purge]

Index: trunk/phase3/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
 13+application/ogg ogg ogm ogv
1414 application/pdf pdf
1515 application/x-javascript js
1616 application/x-shockwave-flash swf
@@ -29,7 +29,7 @@
3030 image/x-xcf xcf
3131 text/plain txt
3232 text/html html htm
33 -video/ogg ogm ogg
 33+video/ogg ogm ogg ogv
3434 video/mpeg mpg mpeg
3535 END_STRING
3636 );
@@ -360,7 +360,7 @@
361361 'xbm',
362362
363363 // Formats we recognize magic numbers for
364 - 'djvu', 'ogg', 'mid', 'pdf', 'wmf', 'xcf',
 364+ 'djvu', 'ogg', 'ogv', 'mid', 'pdf', 'wmf', 'xcf',
365365
366366 // XML formats we sure hope we recognize reliably
367367 'svg',
Index: trunk/phase3/includes/filerepo/File.php
@@ -79,7 +79,8 @@
8080 'htm' => 'html',
8181 'jpeg' => 'jpg',
8282 'mpeg' => 'mpg',
83 - 'tiff' => 'tif' );
 83+ 'tiff' => 'tif',
 84+ 'ogv' => 'ogg' );
8485 if( isset( $squish[$lower] ) ) {
8586 return $squish[$lower];
8687 } elseif( preg_match( '/^[0-9a-z]+$/', $lower ) ) {

Status & tagging log