MDL-14412 Applied Michael's patches to fix ram/rm support in firefox. Merged from...

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index fca1ded3ab09e8d56a90fcf326fcd8c6e1e9ccc7..b673303bca3c7a64812c851de640a399d2a37631 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -1,3 +1,4 @@
+<<<<<<< filter.php
 <?php // $Id$
 //////////////////////////////////////////////////////////////
 //  Media plugin filtering
@@ -207,7 +208,7 @@ document.write(\'<object classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" wi
   <param name="controls" value="imagewindow" />\\
   <param name="console" value="video" />\\
   <param name="loop" value="true" />\\
-  <embed src="'.$url.'" width=240" height="180" loop="true" type="'.$mimetype.'" controls="imagewindow" console="video" autostart="'.$autostart.'" />\\
+  <embed src="'.$url.'" width="240" height="180" loop="true" type="'.$mimetype.'" controls="imagewindow" console="video" autostart="'.$autostart.'" />\\
   </object><br />\\
   <object classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="240" height="30">\\
   <param name="src" value="'.$url.'" />\\

diff --git a/lib/filelib.php b/lib/filelib.php
index a59935bd722d9af52e019e6fe79ada332ffa2642..1dbc5cbf4addc117432034b02b62c50d9f2f9bbf 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1,3 +1,4 @@
+<<<<<<< filelib.php
 <?php //$Id$
 
 ///////////////////////////////////////////////////////////////////////////
@@ -902,10 +903,10 @@ function get_mimetypes_array() {
 
         'ps'   => array ('type'=>'application/postscript', 'icon'=>'pdf.gif'),
         'qt'   => array ('type'=>'video/quicktime', 'icon'=>'video.gif'),
-        'ra'   => array ('type'=>'audio/x-realaudio', 'icon'=>'audio.gif'),
-        'ram'  => array ('type'=>'audio/x-pn-realaudio', 'icon'=>'audio.gif'),
+        'ra'   => array ('type'=>'audio/x-realaudio-plugin', 'icon'=>'audio.gif'),
+        'ram'  => array ('type'=>'audio/x-pn-realaudio-plugin', 'icon'=>'audio.gif'),
         'rhb'  => array ('type'=>'text/xml', 'icon'=>'xml.gif'),
-        'rm'   => array ('type'=>'audio/x-pn-realaudio', 'icon'=>'audio.gif'),
+        'rm'   => array ('type'=>'audio/x-pn-realaudio-plugin', 'icon'=>'audio.gif'),
         'rtf'  => array ('type'=>'text/rtf', 'icon'=>'text.gif'),
         'rtx'  => array ('type'=>'text/richtext', 'icon'=>'text.gif'),
         'sh'   => array ('type'=>'application/x-sh', 'icon'=>'text.gif'),