[freeside-commits] branch FREESIDE_3_BRANCH updated. 82abe98b0919ac63d1e2b5c3e1b35d7abc8eea52

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  82abe98b0919ac63d1e2b5c3e1b35d7abc8eea52 (commit)
      from  5e63471800ab8951f2d0f5c679215889fba659db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 82abe98b0919ac63d1e2b5c3e1b35d7abc8eea52
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 12 17:08:35 2015 -0800

    better fix for #24331

diff --git a/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js b/httemplate/elements/ckeditor/plugins/blockprotect/plugin.js
index 376d2bc..e4ef391 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(/ /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,

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/ckeditor/plugins/blockprotect/plugin.js |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)