Ticket #5668: 5668_2.patch

editor/_source/classes/fckdataprocessor.js

@@ -101 +101 @@
         {
                 var data = FCKXHtml.GetXHTML( rootNode, !excludeRoot, format ) ;
 
-                if ( ignoreIfEmptyParagraph && FCKRegexLib.EmptyOutParagraph.test( data ) )
-                        return '' ;
-
+                if ( ignoreIfEmptyParagraph )
+                        data = data.replace( FCKRegexLib.EmptyOutParagraph, '' );
                 return data ;
         },
 

editor/_source/internals/fckxhtml.js

@@ -147 +147 @@
 
 FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement )
 {
-        var oNode = htmlNode.firstChild ;
-
-        while ( oNode )
+        // To defense any possibly IE DOM (due to invalid HTML), where the sibling references are
+        // unreliable, the safest way is to to traverse through child nodes.
+        for ( var i = 0, oNode, length = htmlNode.childNodes.length; i < length; i++ )
         {
+                oNode = htmlNode.childNodes[ i ];
                 this._AppendNode( xmlNode, oNode ) ;
-                oNode = oNode.nextSibling ;
         }
 
         // Trim block elements. This is also needed to avoid Firefox leaving extra

editor/_source/internals/fckregexlib.js

@@ -63 +63 @@
 // Empty elements may be <p></p> or even a simple opening <p> (see #211).
 EmptyParagraph  : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/ ,
 
-EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;|&#160;)(<\/\1>)?$/ ,
+EmptyOutParagraph : /<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;|&#160;)(<\/\1>)?$/ ,
 
 TagBody                 : /></ ,