summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-02-12 17:08:27 -0800
committerMark Wells <mark@freeside.biz>2015-02-12 17:08:27 -0800
commit4847873e256f5472e4b841b2a5c2ba6188add668 (patch)
treefb5920a28d16a85f9dd394ef47f34f98e9a7afc7
parent0608c88ad776f249adde35abe233de8fb1986c71 (diff)
better fix for #24331
-rw-r--r--httemplate/elements/ckeditor/plugins/blockprotect/plugin.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js b/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js
index 376d2bc3c..e4ef39167 100644
--- a/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js
+++ b/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js
@@ -7,6 +7,7 @@
var delim_c = '}';
var create_block = function(content, inside) {
+ if (inside) return content;
// fix nbsp's
content = content.replace(/&nbsp;/gi, ' ');
// escape the content
@@ -18,12 +19,7 @@
el.innerText = content;
}
el.setAttribute('class', 'cke_blockprotect');
- if (inside) {
- return el.innerHTML; // escapes the contents but doesn't wrap
- // them in a <span>
- } else {
- return el.outerHTML;
- }
+ return el.outerHTML;
};
var block_writeHtml = function( element ) {
// to unescape the element contents, write it out as HTML,