Ticket #6155: 6155.patch

_source/plugins/table/dialogs/table.js

@@ -130 +130 @@
                                 if ( this._.selectedElement )
                                 {
                                         var selection = editor.getSelection(),
-                                                bms = editor.getSelection().createBookmarks();
+                                                bms = selection.createBookmarks();
                                 }
 
                                 var table = this._.selectedElement || makeElement( 'table' ),
@@ -177 +177 @@
                                                 for ( i = 0 ; i < theRow.getChildCount() ; i++ )
                                                 {
                                                         var th = theRow.getChild( i );
-                                                        if ( th.type == CKEDITOR.NODE_ELEMENT )
+                                                        // Skip bookmark nodes. (#6155)
+                                                        if ( th.type == CKEDITOR.NODE_ELEMENT && !th.hasAttribute( '_fck_bookmark' ) )
                                                         {
                                                                 th.renameNode( 'th' );
                                                                 th.setAttribute( 'scope', 'col' );