tinymce/video MDL-19611 Restoring the video button so at least it works and we can...

diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index b07e85c8377996bc198d5b22e729026009be68cc..9cb5b5dea10802f15131edbccb3d41ef89899b58 100644 (file)
--- 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 911c03dcc59e4757f0cbddda361e0fa6d5a5dac4..37c778b092418f8ab34874a484ab84a018cde55d 100644 (file)
--- 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>\r
                                                                <td>\r
                                                                        <select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">\r
-                                                                               <option value="flash">Flash</option>\r
+                                                                               <option value="flash">Flash/Youtube</option>\r
                                                                                <!-- <option value="flv">Flash video (FLV)</option> -->\r
                                                                                <option value="qt">Quicktime</option>\r
                                                                                <option value="shockwave">Shockwave</option>\r