From 460da32af8311bfff365aadd9f42eef15de6c312 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Mon, 16 Feb 2009 07:08:17 +0000
Subject: [PATCH] "FILTER/MDL-17703, reverse changes to work within p tag"

---
 filter/mediaplugin/filter.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index 1c2d49ab0e2..8b106a7695a 100644
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -116,18 +116,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>';
 }
@@ -136,7 +134,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];
@@ -144,12 +141,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>';
 }
@@ -160,7 +156,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];
@@ -168,13 +163,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>';
 }