Skip to content
Permalink
Browse files

Merge branch 't/11250'

  • Loading branch information...
Reinmar committed Dec 5, 2013
2 parents 4cdcded + 4f3a7f0 commit 213d91c104265f37fbb25e20d9374525b6f2bb59
Showing with 5 additions and 4 deletions.
  1. +1 −0 CHANGES.md
  2. +4 −4 plugins/entities/plugin.js
@@ -33,6 +33,7 @@ Fixed Issues:
* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: Method applyStyle removes attributes from nested elements.
* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: editor.destroy() does not cleanup content generated by [TableResize plugin](http://ckeditor.com/addon/tableresize) for inline editors.
* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute's value is deleted when pasting content from MS Word.
* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside `<textarea>` element are not encoded.

## CKEditor 4.3

@@ -67,7 +67,7 @@
table[ org ] = result;
regex.push( org );
return '';
});
} );

if ( !reverse && entities ) {
// Transforms the entities string into an array.
@@ -147,14 +147,14 @@
return baseEntitiesTable[ character ];
}

htmlFilter.addRules({
htmlFilter.addRules( {
text: function( text ) {
return text.replace( baseEntitiesRegex, getChar ).replace( entitiesRegex, getEntity );
}
});
}, { applyToAll: true } );
}
}
});
} );
})();

/**

0 comments on commit 213d91c

Please sign in to comment.
You can’t perform that action at this time.