tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3535 from manja/3.1

Browse Source
This commit is contained in:
Daniel Hensby 2016-11-03 14:39:24 +00:00
commit 683bde6d82
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/HtmlEditorField.js
View File

@ -213,11 +213,12 @@ ss.editorWrappers.tinyMCE = (function() {
* {DOMElement} * {DOMElement}
*/ */
cleanLink: function(href, node) { cleanLink: function(href, node) {
var cb = tinyMCE.settings['urlconverter_callback']; var cb = tinyMCE.settings['urlconverter_callback'],
cu = tinyMCE.settings['convert_urls'];
if(cb) href = eval(cb + "(href, node, true);"); if(cb) href = eval(cb + "(href, node, true);");
// Turn into relative // Turn into relative, if set in TinyMCE config
if(href.match(new RegExp('^' + tinyMCE.settings['document_base_url'] + '(.*)$'))) { if(cu && href.match(new RegExp('^' + tinyMCE.settings['document_base_url'] + '(.*)$'))) {
href = RegExp.$1; href = RegExp.$1;
} }