"FILTER/MDL-17703, reverse changes to work within p tag, merged from 1.9"

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index 1d4bb2e7cf3ff9be3b3f76accd1d58190120e892..5086fd6ec109099041884544e0a190763e8aa9ec 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -129,18 +129,16 @@ function mediaplugin_filter_mp3_callback($link) {
     static $count = 0;
     $count++;
     $id = 'filter_mp3_'.time().$count; //we need something unique because it might be stored in text cache
-    $div_id = 'filter_mp3player_'.time().$count;
 
     $url = addslashes_js($link[1]);
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_mp3" id="'.$id.'">('.get_string('mp3audio', 'mediaplugin').')</span>
-<div id="'.$div_id.'" class="mediaplugin_mp3"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$CFG->wwwroot.'/filter/mediaplugin/mp3player.swf?src='.$url.'",
     width:"90", height:"15", majorversion:"6", build:"40", flashvars:"'.$c.'", quality: "high" };
-  UFO.create(FO, "'.$div_id.'");
+  UFO.create(FO, "'.$id.'");
 //]]>
 </script>';
 }
@@ -149,7 +147,6 @@ function mediaplugin_filter_swf_callback($link) {
     static $count = 0;
     $count++;
     $id = 'filter_swf_'.time().$count; //we need something unique because it might be stored in text cache
-    $div_id = 'filter_swfplayer_'.time().$count;
 
     $width  = empty($link[3]) ? '400' : $link[3];
     $height = empty($link[4]) ? '300' : $link[4];
@@ -157,12 +154,11 @@ function mediaplugin_filter_swf_callback($link) {
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_swf" id="'.$id.'">('.get_string('flashanimation', 'mediaplugin').')</span>
-<div id="'.$div_id.'" class="mediaplugin_swf"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$url.'", width:"'.$width.'", height:"'.$height.'", majorversion:"6", build:"40",
     allowscriptaccess:"never", quality: "high" };
-  UFO.create(FO, "'.$div_id.'");
+  UFO.create(FO, "'.$id.'");
 //]]>
 </script>';
 }
@@ -173,7 +169,6 @@ function mediaplugin_filter_flv_callback($link) {
     static $count = 0;
     $count++;
     $id = 'filter_flv_'.time().$count; //we need something unique because it might be stored in text cache
-    $div_id = 'filter_flvplayer_'.time().$count;
 
     $width  = empty($link[3]) ? '480' : $link[3];
     $height = empty($link[4]) ? '360' : $link[4];
@@ -181,13 +176,12 @@ function mediaplugin_filter_flv_callback($link) {
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_flv" id="'.$id.'">('.get_string('flashvideo', 'mediaplugin').')</span>
-<div id="'.$div_id.'" class="mediaplugin_flv"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$CFG->wwwroot.'/filter/mediaplugin/flvplayer.swf?file='.$url.'",
     width:"'.$width.'", height:"'.$height.'", majorversion:"6", build:"40",
     allowscriptaccess:"never", quality: "high" };
-  UFO.create(FO, "'.$div_id.'");
+  UFO.create(FO, "'.$id.'");
 //]]>
 </script>';
 }