Skip to content

Commit

Permalink
Merge branch 't/11250'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Dec 5, 2013
2 parents 4cdcded + 4f3a7f0 commit 213d91c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions plugins/entities/plugin.js
Expand Up @@ -67,7 +67,7 @@
table[ org ] = result;
regex.push( org );
return '';
});
} );

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

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

/**
Expand Down

0 comments on commit 213d91c

Please sign in to comment.