Merge branch 'w43_MDL-35771_m24_zindex' of git://github.com/skodak/moodle

lib/editor/tinymce/lib.php

@@ -27,7 +27,7 @@ defined('MOODLE_INTERNAL') || die();
 
 class tinymce_texteditor extends texteditor {
     /** @var string active version - this is the directory name where to find tinymce code */
-    public $version = '3.5.7';
+    public $version = '3.5.7b';
 
     /**
      * Is the current browser supported by this editor?

lib/editor/tinymce/readme_moodle.txt

@@ -14,7 +14,13 @@ Upgrade procedure:
 3/ bump up main version.php
 4/ update lib/thirdpartylibs.xml
 5/ execute cli/update_lang_files.php and review changes in lang/en/editor_tinymce.php
+6/ use search to find oversized zIndexes and divide them by 100
 
 
+Changes:
+
+1/ zIndex 300000 and 200000 changed to 3000 and 2000 - this prevents collision with YUI,
+   see MDL-35771
+
 TODO:
  * create some new automated script that sends other languages from upstream into AMOS

lib/editor/tinymce/tiny_mce/3.5.7b/plugins/inlinepopups/editor_plugin_src.js

@@ -36,7 +36,7 @@
 			var t = this;
 
 			t.parent(ed);
-			t.zIndex = 300000;
+			t.zIndex = 3000;
 			t.count = 0;
 			t.windows = {};
 		},