From: moodler <moodler>
Date: Thu, 8 Oct 2009 04:33:55 +0000 (+0000)
Subject: tinymce/video MDL-19611 Restoring the video button so at least it works and we can... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=453bf70f6e1740a6da84f1bbfc3e32533c3455d0;p=moodle.git

tinymce/video MDL-19611 Restoring the video button so at least it works and we can do demos and tests.  If there are still security issues then please describe them.
---

diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index b07e85c837..9cb5b5dea1 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -88,6 +88,7 @@ class tinymce_texteditor extends texteditor {
             }
         }
 
+        $xmedia = 'media, ';
         $filters = filter_get_active_in_context($context);
         if (array_key_exists('filter/tex', $filters)) {
             $xdragmath = 'dragmath,';
diff --git a/lib/editor/tinymce/plugins/media/media.htm b/lib/editor/tinymce/plugins/media/media.htm
index 911c03dcc5..37c778b092 100644
--- a/lib/editor/tinymce/plugins/media/media.htm
+++ b/lib/editor/tinymce/plugins/media/media.htm
@@ -29,7 +29,7 @@
 								<td><label for="media_type">{#media_dlg.type}</label></td>
 								<td>
 									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
-										<option value="flash">Flash</option>
+										<option value="flash">Flash/Youtube</option>
 										<!-- <option value="flv">Flash video (FLV)</option> -->
 										<option value="qt">Quicktime</option>
 										<option value="shockwave">Shockwave</option>