Ticket #5436: 5436_5.patch

_source/plugins/wysiwygarea/plugin.js

@@ -121 +121 @@
 
                         range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
 
-                        var next = lastElement.getNextSourceNode( true );
-                        var lastElementIsInline = CKEDITOR.dtd.$inline[ lastElement.getName() ]
-                        if ( !lastElementIsInline && next && next.type == CKEDITOR.NODE_ELEMENT )
-                                range.moveToElementEditStart( next );
+                        if ( isBlock )
+                        {
+                                var next = lastElement.getNext( function( el )
+                                {
+                                        return el.type == CKEDITOR.NODE_ELEMENT;
+                                });
+
+                                if ( next && CKEDITOR.dtd.$block[ next.getName() ] )
+                                        range.moveToElementEditStart( next );
+                        }
 
                         selection.selectRanges( [ range ] );