Ticket #5436: 5436_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -122 +122 @@
                         range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
 
                         var next = lastElement.getNextSourceNode( true );
-                        if ( next && next.type == CKEDITOR.NODE_ELEMENT )
+                        var lastElementIsInline = CKEDITOR.dtd.$inline[ lastElement.getName() ]
+                        if ( !lastElementIsInline && next && next.type == CKEDITOR.NODE_ELEMENT )
                                 range.moveToElementEditStart( next );
 
                         selection.selectRanges( [ range ] );
@@ -902 +903 @@
                         editor.on( 'insertElement', function ( evt )
                         {
                                 var element = evt.data;
-                                if ( element.type = CKEDITOR.NODE_ELEMENT
+                                if ( element.type == CKEDITOR.NODE_ELEMENT
                                                 && ( element.is( 'input' ) || element.is( 'textarea' ) ) )
                                 {
                                         element.setAttribute( 'contentEditable', false );