Ticket #3100: 3100.patch

_source/plugins/wysiwygarea/plugin.js

@@ -55 +55 @@
                                         if ( startPath.block )
                                                 range.splitBlock();
                                 }
-
+                                
+                                // Normalize text range
+                                range.trim( false, true );
+                                var insertingParent = range.startContainer, 
+                                        bm, 
+                                        insertingPoint,
+                                        isValid = true;
+                                // Figure out the if insertion point is of valid schema, if not, break the inserting parent.
+                                while( insertingParent.getName() != 'body' && 
+                                        !CKEDITOR.dtd[ insertingParent.getName() ][ clone.getName() ] )
+                                {
+                                        isValid = false;
+                                        // Lazy creating position marker for the breaking.
+                                        if( !bm )
+                                        {
+                                                bm  = range.createBookmark();
+                                                insertingPoint = bm.startNode;
+                                        }
+                                        insertingParent = insertingParent.getParent();
+                                }
+                                if( !isValid )
+                                {
+                                        insertingPoint.breakParent( insertingParent.getFirst() );
+                                        range.moveToBookmark( bm );
+                                }
+                                
                                 // Insert the new node.
                                 range.insertNode( clone );