Ticket #6744: 6744.patch

_source/core/dom/range.js

@@ -268 +268 @@
         // check(Start|End)OfBlock.
         function getCheckStartEndBlockEvalFunction( isStart )
         {
-                var hadBr = false, bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true );
+                var hadBr = false,
+                        bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true ),
+                        noneWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 );
                 return function( node )
                 {
                         // First ignore bookmark nodes.
@@ -289 +291 @@
                                 {
                                         // If we're working at the end-of-block, forgive the first <br /> in non-IE
                                         // browsers.
-                                        if ( !isStart && !CKEDITOR.env.ie && node.getName() == 'br' && !hadBr )
+                                        if ( !CKEDITOR.env.ie && node.getName() == 'br'
+                                                        && !hadBr && ( !isStart || node.getNext( noneWhitespaces ) ) )
                                                 hadBr = true;
                                         else
                                                 return false;