Ticket #6297: 6297_2.patch

_source/core/dom/walker.js

@@ -334 +334 @@
                 'table-column' : 1,
                 'table-cell' : 1,
                 'table-caption' : 1
-        },
-        blockBoundaryNodeNameMatch = { hr : 1 };
+        };
 
         CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames )
         {
-                var nodeNameMatches = CKEDITOR.tools.extend( {},
-                                                                                                        blockBoundaryNodeNameMatch, customNodeNames || {} );
+                var nodeNameMatches = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} );
 
-                return blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ] ||
-                        nodeNameMatches[ this.getName() ];
+                // Don't consider floated formatting as block boundary, fall back to dtd check in that case. (#6297)  
+                return this.getComputedStyle( 'float' ) == 'none' && blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ]
+                                || nodeNameMatches[ this.getName() ];
         };
 
         CKEDITOR.dom.walker.blockBoundary = function( customNodeNames )