Ticket #3671: 3671_4.patch

_source/core/htmlparser/fragment.js

@@ -104 +104 @@
 
                         // 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, realElementName;
+                                if ( element.attributes
+                                         && ( realElementName =
+                                                  element.attributes[ '_cke_real_element_type' ] ) )
+                                        elementName = realElementName;
+                                else
+                                        elementName =  element.name;
+                                if ( !( elementName in CKEDITOR.dtd.$body ) )
+                                {
+                                        var savedCurrent = currentNode;
 
-                                // Create a <p> in the fragment.
-                                currentNode = target;
-                                parser.onTagOpen( fixForBody, {} );
+                                        // Create a <p> in the fragment.
+                                        currentNode = target;
+                                        parser.onTagOpen( fixForBody, {} );
 
-                                // 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

CHANGES.html

@@ -119 +119 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3887">#3887</a> : Fixed an issue in which the create
                         list command may leak outside of a selected table cell and into the rest of document.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3916">#3916</a> : Fixed maximize does not enlarge editor width when width is set.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>