Ticket #6159: 6159_2.patch

_source/plugins/list/plugin.js

@@ -34 +34 @@
                         {
                                 var listItem = listNode.getChild( i );
 
-                                // It may be a text node or some funny stuff.
-                                if ( listItem.$.nodeName.toLowerCase() != 'li' )
-                                        continue;
+                        // It may be a text node or some funny stuff.
+                        if (listItem.$.nodeName.toLowerCase() != 'li')
+                        {
+                                // The item might be probably a malformed list. (#6159)
+                                if ( listItem.getName() in CKEDITOR.dtd.$list )
+                                {
+                                        var previousItemObj = baseArray[ baseArray.length - 1 ];
+                                        if ( previousItemObj )
+                                                previousItemObj.contents.push( listItem );
+                                }
+                                continue;
+                        }
 
                                 var itemObj = { 'parent' : listNode, indent : baseIndentLevel, element : listItem, contents : [] };
                                 if ( !grandparentNode )
@@ -55 +64 @@
                                 for ( var j = 0, itemChildCount = listItem.getChildCount(), child; j < itemChildCount ; j++ )
                                 {
                                         child = listItem.getChild( j );
-                                        if ( child.type == CKEDITOR.NODE_ELEMENT && listNodeNames[ child.getName() ] )
-                                                // Note the recursion here, it pushes inner list items with
-                                                // +1 indentation in the correct order.
-                                                CKEDITOR.plugins.list.listToArray( child, database, baseArray, baseIndentLevel + 1, itemObj.grandparent );
-                                        else
-                                                itemObj.contents.push( child );
+                    if (child.type == CKEDITOR.NODE_ELEMENT && listNodeNames[ child.getName() ])
+                    // Note the recursion here, it pushes inner list items with
+                    // +1 indentation in the correct order.
+                    {
+                        CKEDITOR.plugins.list.listToArray(child, database, baseArray, baseIndentLevel + 1, itemObj.grandparent);
+                    }
+                    else
+                        itemObj.contents.push(child);
                                 }
                         }
                         return baseArray;