From: Nick Jenkins <nickj@users.mediawiki.org>
Date: Mon, 23 Apr 2007 01:41:19 +0000 (+0000)
Subject: Tweak for E_STRICT warning "Undefined index:   in includes/MimeMagic.php on line... 
X-Git-Tag: 1.31.0-rc.0~53280
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=e12bc95fda8501a1cc0bb257cd7a0635a60cb913;p=lhc%2Fweb%2Fwiklou.git

Tweak for E_STRICT warning "Undefined index:   in includes/MimeMagic.php on line 267" on:
curl --silent --include --globoff -F 'f'='..' -F 'w'='1930' -F 'r'='\</rp></dt>' 'http://localhost/wiki/thumb.php'
(Only happens because E_STRICT seems to disable the @ error control operator)
---

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 516a3cda51..df7a474936 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -262,7 +262,7 @@ class MimeMagic {
 	function getTypesForExtension($ext) {
 		$ext= strtolower($ext);
 
-		$r= @$this->mExtToMime[$ext];
+		$r= isset( $this->mExtToMime[$ext] ) ? $this->mExtToMime[$ext] : null;
 		return $r;
 	}