Ticket #7817: 7817.patch

_source/plugins/wysiwygarea/plugin.js

@@ -462 +462 @@
 
                 init : function( editor )
                 {
-                        var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+                        var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR && editor.config.autoParagraph !== false )
                                 ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
 
                         var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );