Ticket #5271: 5271.patch

_source/plugins/list/plugin.js

@@ -228 +228 @@
                 newList.listNode.replace( groupObj.root );
         }
 
+        var headerTagRegex = /^h[1-6]$/;
+
         function createList( editor, groupObj, listsCreated )
         {
                 var contents = groupObj.contents,
@@ -279 +281 @@
                 {
                         var contentBlock = listContents.shift(),
                                 listItem = doc.createElement( 'li' );
-                        contentBlock.moveChildren( listItem );
-                        contentBlock.remove();
+
+                        // Preserve heading structure when converting to list item. (#5271)
+                        if ( headerTagRegex.test( contentBlock.getName() ) )
+                        {
+                                var tmp = new CKEDITOR.dom.documentFragment( contentBlock.getDocument() );
+                                tmp.append( contentBlock );
+                                contentBlock = tmp;
+                        }
+                        
+                        if ( contentBlock.type == CKEDITOR.NODE_ELEMENT )
+                        {
+                                contentBlock.copyAttributes( listItem );
+                                contentBlock.remove();
+                        }
+
+                        contentBlock.moveChildren( listItem );
                         listItem.appendTo( listNode );
 
                         // Append a bogus BR to force the LI to render at full height