From 2d38ed8aa4c5296b322a48d2bbffe4a6fbf46377 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 6 Jun 2008 19:58:06 +0000
Subject: [PATCH] Add 'ogv' as recognized alias to 'ogg', allowing uploads of
 .ogv files to proceed if allowed

---
 includes/MimeMagic.php     | 6 +++---
 includes/filerepo/File.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index e7c30edd9f..01d33c7e6a 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
+application/ogg ogg ogm ogv
 application/pdf pdf
 application/x-javascript js
 application/x-shockwave-flash swf
@@ -29,7 +29,7 @@ image/x-portable-pixmap ppm
 image/x-xcf xcf
 text/plain txt
 text/html html htm
-video/ogg ogm ogg
+video/ogg ogm ogg ogv
 video/mpeg mpg mpeg
 END_STRING
 );
@@ -360,7 +360,7 @@ class MimeMagic {
 			'xbm',
 
 			// Formats we recognize magic numbers for
-			'djvu', 'ogg', 'mid', 'pdf', 'wmf', 'xcf',
+			'djvu', 'ogg', 'ogv', 'mid', 'pdf', 'wmf', 'xcf',
 
 			// XML formats we sure hope we recognize reliably
 			'svg',
diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 7fb26f387c..7a1c68e3dc 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -79,7 +79,8 @@ abstract class File {
 			'htm' => 'html',
 			'jpeg' => 'jpg',
 			'mpeg' => 'mpg',
-			'tiff' => 'tif' );
+			'tiff' => 'tif',
+			'ogv' => 'ogg' );
 		if( isset( $squish[$lower] ) ) {
 			return $squish[$lower];
 		} elseif( preg_match( '/^[0-9a-z]+$/', $lower ) ) {
-- 
2.20.1