Ticket #3609: 3609_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -173 +173 @@
 
                 init : function( editor )
                 {
+                        var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+                                ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
+
                         editor.on( 'editingBlockReady', function()
                                 {
                                         var mainElement,
@@ -434 +437 @@
                                                                 // Get the HTML version of the data.
                                                                 if ( editor.dataProcessor )
                                                                 {
-                                                                        var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
-                                                                                ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
                                                                         data = editor.dataProcessor.toHtml( data, fixForBody );
                                                                 }
 
@@ -487 +488 @@
                                                                 var data = iframe.getFrameDocument().getBody().getHtml();
 
                                                                 if ( editor.dataProcessor )
-                                                                        data = editor.dataProcessor.toDataFormat( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
+                                                                        data = editor.dataProcessor.toDataFormat( data, fixForBody );
 
                                                                 // Strip the last blank paragraph within document.
                                                                 if ( editor.config.ignoreEmptyParagraph )