Ticket #7070: 7070_3.patch

_source/core/dom/walker.js

@@ -430 +430 @@
         };
 
         var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/,
-                isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 ),
-                isNotBookmark = CKEDITOR.dom.walker.bookmark( 0, 1 ),
-                fillerEvaluator = function( element )
+                isWhitespaces = CKEDITOR.dom.walker.whitespaces(),
+                isBookmark = CKEDITOR.dom.walker.bookmark(),
+                toSkip = function( node )
                 {
-                        return isNotBookmark( element ) && isNotWhitespaces( element );
+                        return isBookmark( node )
+                                        || isWhitespaces( node )
+                                        || node.type == CKEDITOR.NODE_ELEMENT && node.getName() in CKEDITOR.dtd.$removeEmpty;
                 };
 
         // Check if there's a filler node at the end of an element, and return it.
         CKEDITOR.dom.element.prototype.getBogus = function()
         {
-                var tail = this.getLast( fillerEvaluator );
+                // Bogus are not always at the block end, e.g. <p><strong>text<br /></strong></p> (#7070).
+                var tail = this;
+                do { tail = tail.getPreviousSourceNode(); }
+                while ( toSkip( tail ) )
+
                 if ( tail && ( !CKEDITOR.env.ie ? tail.is && tail.is( 'br' )
                                 : tail.getText && tailNbspRegex.test( tail.getText() ) ) )
                 {