Index: lib/filelib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/filelib.php,v retrieving revision 1.179 diff -u -r1.179 filelib.php --- lib/filelib.php 18 Feb 2010 18:15:56 -0000 1.179 +++ lib/filelib.php 3 Mar 2010 12:07:54 -0000 @@ -1274,15 +1274,19 @@ * @param string $element Desired information (usually 'icon') * @param string $icon Icon file path. * @param boolean $all return all matching entries (defaults to false - last match) + * @param boolean $includedefault include document/unknown (defaults to true) * @return string Requested piece of information from array */ -function mimeinfo_from_icon($element, $icon, $all=false) { +function mimeinfo_from_icon($element, $icon, $all=false, $includedefault=true) { $mimeinfo = get_mimetypes_array(); if (preg_match("/\/(.*)/", $icon, $matches)) { $icon = $matches[1]; } - $info = array($mimeinfo['xxx'][$element]); // Default + $info = array(); + if ($includedefault) { + $info[] = $mimeinfo['xxx'][$element]; // Default + } foreach($mimeinfo as $values) { if($values['icon']==$icon) { if(isset($values[$element])) {