From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Fri, 7 Oct 2005 19:39:48 +0000 (+0000)
Subject: * (bug 3641) changed the upload rules so that mime types of file contents
X-Git-Tag: 1.6.0~1515
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=f9ad9b7012bd8d90d698753b764cb2103d6e3969;p=lhc%2Fweb%2Fwiklou.git

* (bug 3641) changed the upload rules so that mime types of file contents
  have to match the file extension.
---

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 475273ce88..06b79a7843 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -752,12 +752,16 @@ class UploadForm {
 	function verifyExtension( $mime, $extension ) {
 		$fname = 'SpecialUpload::verifyExtension';
 
-		if (!$mime || $mime=="unknown" || $mime=="unknown/unknown") {
-			wfDebug( "$fname: passing file with unknown mime type\n" );
-			return true;
-		}
+		$magic =& wfGetMimeMagic();
 
-		$magic=& wfGetMimeMagic();
+		if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' )
+			if ( ! $magic->getTypesForExtension( $extension ) ) {
+				wfDebug( "$fname: passing file with unknown mime type and unknown extension\n" );
+				return true;
+			} else {
+				wfDebug( "$fname: rejecting file with unknown mime type but known extension\n" );
+				return false;
+			}
 
 		$match= $magic->isMatchingExtension($extension,$mime);