From: defacer <defacer>
Date: Mon, 24 May 2004 11:16:06 +0000 (+0000)
Subject: The way this was written before, it produced a warning for unregistered extensions.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8ccc9d060f2efb582e085cc193d40df2ead5d51d;p=moodle.git

The way this was written before, it produced a warning for unregistered extensions.
---

diff --git a/files/mimetypes.php b/files/mimetypes.php
index 58e2552913..1014970e2e 100644
--- a/files/mimetypes.php
+++ b/files/mimetypes.php
@@ -78,11 +78,11 @@ function mimeinfo($element, $filename) {
     );
 
     if (eregi("\.([a-z0-9]+)$", $filename, $match)) {
-        $result = $mimeinfo[strtolower($match[1])][$element];
-    }
-
-    if (!empty($result)) {
-        return $result;
+        if(isset($mimeinfo[strtolower($match[1])][$element])) {
+            return $mimeinfo[strtolower($match[1])][$element];
+        } else {
+            return $mimeinfo["xxx"][$element];   // By default
+        }
     } else {
         return $mimeinfo["xxx"][$element];   // By default
     }