diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index 885af159a10..01537e912e7 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
class tinymce_texteditor extends texteditor {
/** @var string active version - directory name */
- public $version = '3.5';
+ public $version = '3.5.1.1';
public function supported_by_browser() {
if (check_browser_version('MSIE', 6)) {
diff --git a/lib/editor/tinymce/tiny_mce/3.5/jquery.tinymce.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/jquery.tinymce.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/jquery.tinymce.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/jquery.tinymce.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/license.txt b/lib/editor/tinymce/tiny_mce/3.5.1.1/license.txt
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/license.txt
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/license.txt
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/css/advhr.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/css/advhr.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/css/advhr.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/css/advhr.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/js/rule.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/js/rule.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/js/rule.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/js/rule.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/rule.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/rule.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/rule.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/rule.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/css/advimage.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/css/advimage.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/css/advimage.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/css/advimage.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/image.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/image.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/image.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/image.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/img/sample.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/img/sample.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/img/sample.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/img/sample.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/js/image.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/js/image.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/js/image.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/js/image.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/css/advlink.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/css/advlink.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/css/advlink.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/css/advlink.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/js/advlink.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/js/advlink.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/js/advlink.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/js/advlink.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/link.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/link.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/link.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/link.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js
new file mode 100644
index 00000000000..17f825b1bdb
--- /dev/null
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
similarity index 93%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
index 2dd4c696034..87670517192 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
@@ -61,7 +61,7 @@
// We need at least five characters to form a URL,
// hence, at minimum, five characters from the beginning of the line.
- r = ed.selection.getRng().cloneRange();
+ r = ed.selection.getRng(true).cloneRange();
if (r.startOffset < 5) {
// During testing, the caret is placed inbetween two text nodes.
// The previous text node contains the URL.
@@ -124,13 +124,19 @@
r.setEnd(endContainer, start);
}
+ // Exclude last . from word like "www.site.com."
+ var text = r.toString();
+ if (text.charAt(text.length - 1) == '.') {
+ r.setEnd(endContainer, start - 1);
+ }
+
text = r.toString();
- matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
+ matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);
if (matches) {
if (matches[1] == 'www.') {
matches[1] = 'http://www.';
- } else if (/@$/.test(matches[1])) {
+ } else if (/@$/.test(matches[1]) && !/^mailto:/.test(matches[1])) {
matches[1] = 'mailto:' + matches[1];
}
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/dragmath.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/dragmath.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/dragmath.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/dragmath.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/img/dragmath.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/img/dragmath.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/img/dragmath.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/img/dragmath.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/js/dragmath.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/js/dragmath.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/js/dragmath.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/js/dragmath.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/emotions.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/emotions.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/emotions.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/emotions.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cool.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cool.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cool.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cool.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cry.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cry.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cry.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cry.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-embarassed.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-embarassed.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-embarassed.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-embarassed.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-foot-in-mouth.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-foot-in-mouth.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-foot-in-mouth.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-frown.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-frown.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-frown.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-frown.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-innocent.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-innocent.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-innocent.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-innocent.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-kiss.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-kiss.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-kiss.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-kiss.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-laughing.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-laughing.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-laughing.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-laughing.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-money-mouth.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-money-mouth.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-money-mouth.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-sealed.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-sealed.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-sealed.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-sealed.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-smile.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-smile.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-smile.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-smile.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-surprised.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-surprised.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-surprised.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-surprised.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-tongue-out.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-tongue-out.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-tongue-out.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-undecided.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-undecided.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-undecided.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-undecided.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-wink.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-wink.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-wink.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-wink.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-yell.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-yell.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-yell.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-yell.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/js/emotions.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/js/emotions.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/js/emotions.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/js/emotions.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/dialog.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/dialog.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/dialog.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/dialog.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/img/example.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/img/example.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/img/example.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/img/example.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/js/dialog.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/js/dialog.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/js/dialog.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/js/dialog.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/css/fullpage.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/css/fullpage.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/css/fullpage.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/css/fullpage.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/fullpage.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/fullpage.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/fullpage.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/fullpage.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/js/fullpage.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/js/fullpage.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/js/fullpage.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/js/fullpage.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/fullscreen.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/fullscreen.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/fullscreen.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/fullscreen.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/button.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/button.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/window.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/window.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/window.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/window.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/template.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/template.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/template.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/template.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/css/media.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/css/media.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/css/media.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/css/media.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/embed.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/embed.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/embed.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/embed.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/media.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/media.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/media.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/media.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/media.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/media.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/media.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/media.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/moxieplayer.swf b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/moxieplayer.swf
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/moxieplayer.swf
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/moxieplayer.swf
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/dialog.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/dialog.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/dialog.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/dialog.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/img/moodleemoticon.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/img/moodleemoticon.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/img/moodleemoticon.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/img/moodleemoticon.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/js/dialog.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/js/dialog.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/js/dialog.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/js/dialog.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/css/media.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/css/media.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/css/media.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/css/media.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/img/icon.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/img/icon.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/img/icon.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/img/icon.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/js/media.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/js/media.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/moodlemedia.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/moodlemedia.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/moodlemedia.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/moodlemedia.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
similarity index 77%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
index 431b077687c..f26251a5c81 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
@@ -25,6 +25,8 @@
require(dirname(__FILE__) . '/../../../../../../../config.php');
require_once($CFG->libdir . '/filelib.php');
+require_once($CFG->libdir . '/editorlib.php');
+require_once($CFG->libdir . '/editor/tinymce/lib.php');
// Must be logged in
require_login();
@@ -32,9 +34,11 @@ require_login();
// Require path to draftfile.php file
$path = required_param('path', PARAM_PATH);
+$editor = new tinymce_texteditor();
+
// Now output this file which is super-simple
$PAGE->set_pagelayout('embedded');
-$PAGE->set_url(new moodle_url('/lib/editor/tinymce/tiny_mce/3.4.6/plugins/moodlemedia/preview.php',
+$PAGE->set_url(new moodle_url('/lib/editor/tinymce/tiny_mce/'.$editor->version.'/plugins/moodlemedia/preview.php',
array('path' => $path)));
$PAGE->set_context(context_system::instance());
$PAGE->add_body_class('core_media_preview');
@@ -42,7 +46,15 @@ $PAGE->add_body_class('core_media_preview');
echo $OUTPUT->header();
$mediarenderer = $PAGE->get_renderer('core', 'media');
-$url = new moodle_url('/draftfile.php/' . $path);
+
+$path = '/'.trim($path, '/');
+
+if (empty($CFG->slasharguments)) {
+ $url = new moodle_url('/draftfile.php', array('file'=>$path));
+} else {
+ $url = new moodle_url('/draftfile.php');
+ $url->set_slashargument($path);
+}
if ($mediarenderer->can_embed_url($url)) {
echo $mediarenderer->embed_url($url);
}
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/img/ed_nolink.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/img/ed_nolink.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/img/ed_nolink.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/img/ed_nolink.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pastetext.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pastetext.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pastetext.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pastetext.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pasteword.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pasteword.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pasteword.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pasteword.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pastetext.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pastetext.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pastetext.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pastetext.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pasteword.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pasteword.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pasteword.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pasteword.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/example.html b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/example.html
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/example.html
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/example.html
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/jscripts/embed.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/jscripts/embed.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/jscripts/embed.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/jscripts/embed.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/preview.html b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/preview.html
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/preview.html
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/preview.html
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/css/searchreplace.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/css/searchreplace.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/css/searchreplace.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/css/searchreplace.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/js/searchreplace.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/js/searchreplace.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/js/searchreplace.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/js/searchreplace.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
similarity index 96%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
index fe711759598..ae81d40dccc 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
@@ -93,7 +93,7 @@
-
+