Merge branch 'mdl45012-moodle25' of git://github.com/tlock/moodle int…

…o MOODLE_25_STABLE
moodle · Apr 21, 2014 · 6c4fa4d · 6c4fa4d
2 parents 0a11ddf + 9d399ce
commit 6c4fa4d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/filelib.php b/lib/filelib.php
@@ -1603,6 +1603,7 @@ function &get_mimetypes_array() {
         'webm'  => array ('type'=>'video/webm', 'icon'=>'video', 'groups'=>array('video'), 'string'=>'video'),
         'wmv'  => array ('type'=>'video/x-ms-wmv', 'icon'=>'wmv', 'groups'=>array('video'), 'string'=>'video'),
         'asf'  => array ('type'=>'video/x-ms-asf', 'icon'=>'wmv', 'groups'=>array('video'), 'string'=>'video'),
+        'wma'  => array ('type'=>'audio/x-ms-wma', 'icon'=>'audio', 'groups'=>array('audio'), 'string'=>'audio'),
 
         'xbk'  => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
         'xdp'  => array ('type'=>'application/pdf', 'icon'=>'pdf'),