Ticket #3671: 3671_2.patch

_source/plugins/pagebreak/plugin.js

@@ -79 +79 @@
 
                 // Creates the fake image used for this element.
                 breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' );
-
-                var ranges = editor.getSelection().getRanges();
-
-                for ( var range, i = 0 ; i < ranges.length ; i++ )
-                {
-                        range = ranges[ i ];
-
-                        if ( i > 0 )
-                                breakObject = breakObject.clone( true );
-
-                        range.splitBlock( 'p' );
-                        range.insertNode( breakObject );
-                }
-        }
+                editor.insertElement( breakObject );
+        }
 };

_source/plugins/htmldataprocessor/plugin.js

@@ -138 +138 @@
         CKEDITOR.htmlDataProcessor = function()
         {
                 this.writer = new CKEDITOR.htmlWriter();
+                this.basicWriter = new CKEDITOR.htmlParser.basicWriter();
                 this.dataFilter = new CKEDITOR.htmlParser.filter();
                 this.htmlFilter = new CKEDITOR.htmlParser.filter();
         };
@@ -162 +163 @@
                         // Now use our parser to make further fixes to the structure, as
                         // well as apply the filter.
                         var fragment = CKEDITOR.htmlParser.fragment.fromHtml( div.innerHTML, fixForBody ),
-                                writer = new CKEDITOR.htmlParser.basicWriter();
+                                writer = this.basicWriter;
 
                         fragment.writeHtml( writer, this.dataFilter );
 
@@ -171 +172 @@
 
                 toDataFormat : function( html, fixForBody )
                 {
-                        var writer = this.writer,
-                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody );
+                        var basicWriter = this.basicWriter,
+                                htmlWriter = this.writer,
+                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html ),
+                                html;
 
-                        writer.reset();
+                        // First running through html filters, after this step, some
+                        // schema-invalid markup might be generated due to element
+                        // replacement(#3671).
+                        fragment.writeHtml( basicWriter, this.htmlFilter );
+                        html = basicWriter.getHtml( true );
 
-                        fragment.writeHtml( writer, this.htmlFilter );
-
-                        return writer.getHtml( true );
+                        // Then format the intermediate html to final output.
+                        fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody );
+                        fragment.writeHtml( htmlWriter );
+                        return htmlWriter.getHtml( true );
                 }
         };
 })();