MDL-18658 add support for m4a files in the multimedia filter + missing mimetypes...

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index 7e0c5e536bfe9951c9f2811975c6b59ad7dc2828..d248cbc27935f2389b0a8016706cc58147f4a31d 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -58,6 +58,9 @@ class mediaplugin_filter extends moodle_text_filter {
 
             $search = '/<a.*?href="([^<]+\.m4v)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
             $newtext = preg_replace_callback($search, 'mediaplugin_filter_qt_callback', $newtext);
+
+            $search = '/<a.*?href="([^<]+\.m4a)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
+            $newtext = preg_replace_callback($search, 'mediaplugin_filter_qt_callback', $newtext);
         }
 
         if ($CFG->filter_mediaplugin_enable_wmv) {

diff --git a/lib/filelib.php b/lib/filelib.php
index 036dabe67a3096d7de62a04cb02cedcb68ba3e82..cecdb733edadcd035af10e962238798b5c392390 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -940,6 +940,8 @@ function get_mimetypes_array() {
         'm3u'  => array ('type'=>'audio/x-mpegurl', 'icon'=>'audio.gif'),
         'mp3'  => array ('type'=>'audio/mp3', 'icon'=>'audio.gif'),
         'mp4'  => array ('type'=>'video/mp4', 'icon'=>'video.gif'),
+        'm4v'  => array ('type'=>'video/mp4', 'icon'=>'video.gif'),
+        'm4a'  => array ('type'=>'audio/mp4', 'icon'=>'audio.gif'),
         'mpeg' => array ('type'=>'video/mpeg', 'icon'=>'video.gif'),
         'mpe'  => array ('type'=>'video/mpeg', 'icon'=>'video.gif'),
         'mpg'  => array ('type'=>'video/mpeg', 'icon'=>'video.gif'),