MDL-22061 get_mimetype_description() does not rely on get_string() re…

…turning square brackets
sehaj-sk · May 4, 2010 · 1b80c91 · 1b80c91
1 parent 9a6606b
commit 1b80c91
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/filelib.php b/lib/filelib.php
@@ -1383,11 +1383,10 @@ function file_extension_icon($filename, $size=null) {
  * @return string Text description
  */
 function get_mimetype_description($mimetype,$capitalise=false) {
-    $result=get_string($mimetype,'mimetypes');
-    // Surrounded by square brackets indicates that there isn't a string for that
-    // (maybe there is a better way to find this out?)
-    if(strpos($result,'[')===0) {
-        $result=get_string('document/unknown','mimetypes');
+    if (get_string_manager()->string_exists($mimetype, 'mimetypes')) {
+        $result = get_string($mimetype, 'mimetypes');
+    } else {
+        $result = get_string('document/unknown','mimetypes');
     }
     if($capitalise) {
         $result=ucfirst($result);