Ticket #3671: 3671.patch

_source/core/htmlparser/fragment.js

@@ -99 +99 @@
                 {
                         target = target || currentNode || fragment;
 
+
                         // If the target is the fragment and this element can't go inside
                         // body (if fixForBody).
-                        if ( fixForBody && !target.type && !CKEDITOR.dtd.$body[ element.name ] )
+                        if ( fixForBody && !target.type )
                         {
-                                var savedCurrent = currentNode;
+                                var elementName, realElement;
+                                if ( element.attributes
+                                         && ( realElement = element.attributes._cke_realelement )
+                                         && ( realElement = new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realElement ) ) )
+                                         && ( realElement = realElement.children[ 0 ] ) )
+                                        elementName = realElement.name;
+                                else
+                                        elementName =  element.name;
+                                if ( !( elementName in CKEDITOR.dtd.$body ) )
+                                {
+                                        var savedCurrent = currentNode;
 
-                                // Create a <p> in the fragment.
-                                currentNode = target;
-                                parser.onTagOpen( 'p', {} );
+                                        // Create a <p> in the fragment.
+                                        currentNode = target;
+                                        parser.onTagOpen( 'p', {} );
 
-                                // The new target now is the <p>.
-                                target = currentNode;
+                                        // The new target now is the <p>.
+                                        target = currentNode;
 
-                                if ( enforceCurrent )
-                                        currentNode = savedCurrent;
-                        }
+                                        if ( enforceCurrent )
+                                                currentNode = savedCurrent;
+                                }
+                        }
 
                         // Rtrim empty spaces on block end boundary. (#3585)
                         if ( element._.isBlockLike )