Ticket #8870: 8870.patch

_source/core/htmlparser/fragment.js

@@ -194 +194 @@
 
                         target.add( element );
 
+                        if ( element.name == 'pre' )
+                                inPre = false;
+
+                        if ( element.name == 'textarea' )
+                                inTextarea = false;
+
+
                         if ( element.returnPoint )
                         {
                                 currentNode = element.returnPoint;
@@ -360 +367 @@
 
                                 currentNode = candidate;
 
-                                if ( currentNode.name == 'pre' )
-                                        inPre = false;
-
-                                if ( currentNode.name == 'textarea' )
-                                        inTextarea = false;
-
                                 if ( candidate._.isBlockLike )
                                         sendPendingBRs();
 
@@ -399 +400 @@
                                                         || ( currentNode._.isBlockLike ?
                                                                  CKEDITOR.dtd.div : CKEDITOR.dtd.span ) ) : rootDtd;
 
-                        // Fix orphan text in list/table. (#8540)
-                        if ( !currentDtd [ '#' ] && currentName in nonBreakingBlocks )
+                        // Fix orphan text in list/table. (#8540) (#8870)
+                        if ( !inTextarea &&
+                                 !currentDtd [ '#' ] &&
+                                 currentName in nonBreakingBlocks )
                         {
                                 parser.onTagOpen( currentName in listBlocks ? 'li' :
                                                                   currentName == 'dl' ? 'dd' :