Prevent E_STRICT errors on file upload of the following type:
authorNick Jenkins <nickj@users.mediawiki.org>
Fri, 12 Jan 2007 05:44:25 +0000 (05:44 +0000)
committerNick Jenkins <nickj@users.mediawiki.org>
Fri, 12 Jan 2007 05:44:25 +0000 (05:44 +0000)
* Strict Standards: Undefined index: application/ogg in includes/MimeMagic.php on line 154
* Strict Standards: Undefined index: ogm in includes/MimeMagic.php on line 163

includes/MimeMagic.php

index ca05dbb..9fc0bf7 100644 (file)
@@ -149,7 +149,7 @@ class MimeMagic {
 
                        if (empty($ext)) continue;
 
-                       if (@$this->mMimeToExt[$mime]) $this->mMimeToExt[$mime] .= ' '.$ext;
+                       if ( !empty($this->mMimeToExt[$mime])) $this->mMimeToExt[$mime] .= ' '.$ext;
                        else $this->mMimeToExt[$mime]= $ext;
 
                        $extensions= explode(' ',$ext);
@@ -158,7 +158,7 @@ class MimeMagic {
                                $e= trim($e);
                                if (empty($e)) continue;
 
-                               if (@$this->mExtToMime[$e]) $this->mExtToMime[$e] .= ' '.$mime;
+                               if ( !empty($this->mExtToMime[$e])) $this->mExtToMime[$e] .= ' '.$mime;
                                else $this->mExtToMime[$e]= $mime;
                        }
                }