Ticket #6419: 6419_2.patch

_source/core/dom/node.js

@@ -103 +103 @@
                         return element;
                 },
 
+                /**
+                 * Clone the node, including it's attributes and optionally, children.
+                 *
+                 * @param includeChildren
+                 * @param cloneId Possible values are:
+                 * 0|undefined|false Doesn't clone any ID or the internal cke_expando.
+                 * 1|true Clones both IDs and the internal cke_expando.
+                 * 2 Clones only IDs, not the internal cke_expando.
+                 */
                 clone : function( includeChildren, cloneId )
                 {
                         var $clone = this.$.cloneNode( includeChildren );
 
-                        if ( !cloneId )
+                        if ( !cloneId || cloneId == 2 )
                         {
                                 var removeIds = function( node )
                                 {
                                         if ( node.nodeType != CKEDITOR.NODE_ELEMENT )
                                                 return;
 
-                                        node.removeAttribute( 'id', false ) ;
+                                        if ( cloneId != 2 )
+                                                node.removeAttribute( 'id', false ) ;
                                         node.removeAttribute( '_cke_expando', false ) ;
 
                                         var childs = node.childNodes;

_source/plugins/list/plugin.js

@@ -87 +87 @@
                                 {
                                         if ( !rootNode || listArray[ currentIndex ].parent.getName() != rootNode.getName() )
                                         {
-                                                rootNode = listArray[ currentIndex ].parent.clone( false, 1 );
+                                                rootNode = listArray[ currentIndex ].parent.clone( false, 2 );
                                                 retval.append( rootNode );
                                         }
                                         currentListItem = rootNode.append( item.element.clone( 0, 1 ) );