Ticket #2777: 2777.patch

fcktablehandler.js

@@ -288 +288 @@
         if ( cells.length < 1 )
                 return false ;
 
+        // Check if the selected cells are all in the same table section (thead, tfoot or tbody)
+        for (var i = 0; i < cells.length; i++)
+        {
+                if ( cells[i].parentNode.parentNode != cells[0].parentNode.parentNode )
+                        return false ;
+        }
+
         this._MarkCells( cells, '_CellSelected' ) ;
 
         var tableMap = this._CreateTableMap( cells[0] ) ;
@@ -839 +846 @@
         if ( ! nextCell )
                 return null ;
 
+        // Check if the selected cells are both in the same table section (thead, tfoot or tbody).
+        if ( refCell.parentNode.parentNode != nextCell.parentNode.parentNode )
+                return null ;
+
         // The two cells must have the same horizontal geometry, otherwise merging does not makes sense.
         this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
         var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;