Skip to content

Commit 9c7de16

Browse files
committed
Merge branch 't/11504'
2 parents 8a6472a + b0b9ce4 commit 9c7de16

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Fixed Issues:
1919
* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed [`selection.getRanges`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) does not override cached ranges when used with `onlyEditables` argument.
2020
* [#11390](http://dev.ckeditor.com/ticket/11390): All [XML](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) plugin's methods work now on IE10+.
2121
* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when right-to-left UI language is set.
22+
* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When `config.fullPage` is set `true`, entities are not encoded in editor's output.
2223

2324
## CKEditor 4.3.2
2425

core/htmlparser/element.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,12 @@ CKEDITOR.htmlParser.cssStyle = function() {
492492
if ( !ctx.off && this.attributes[ 'data-cke-processor' ] == 'off' )
493493
changes.push( 'off', true );
494494

495-
if ( !ctx.nonEditable && this.attributes[ 'contenteditable' ] == 'false' )
495+
if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' )
496496
changes.push( 'nonEditable', true );
497-
// A context to be given nestedEditable must be nonEditable first (by inheritance).
498-
else if ( !ctx.nestedEditable && this.attributes[ 'contenteditable' ] == 'true' )
497+
// A context to be given nestedEditable must be nonEditable first (by inheritance) (#11372).
498+
// Never set "nestedEditable" context for a body. If body is processed then it indicates
499+
// a fullPage editor and there's no slightest change of nesting such editable (#11504).
500+
else if ( this.name != 'body' && !ctx.nestedEditable && this.attributes.contenteditable == 'true' )
499501
changes.push( 'nestedEditable', true );
500502

501503
if ( changes.length ) {

0 commit comments

Comments
 (0)