Ticket #3933: 3933.patch

_source/plugins/wysiwygarea/plugin.js

@@ -212 +212 @@
                 if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
                 {
                         restoreDirty( editor );
-                        var paddingBlock = editor.document.createElement(
-                                        ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ?
-                                                '<br _cke_bogus="true" />' : 'br' );
+                        var paddingBlock = CKEDITOR.dom.element.createFromHtml( '<br _cke_bogus="true" />' );
                         body.append( paddingBlock );
                 }
         }
@@ -634 +632 @@
                                         editor.on( 'insertElement', onInsertElement, null, null, 20 );
                                         // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
                                         editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
+                                        // Clean up those bogus elements introduced by it on output (#3933).
+                                        var dataProcessor = editor.dataProcessor,
+                                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                                        htmlFilter && htmlFilter.addRules(
+                                        {
+                                                elements :
+                                                {
+                                                        'br' : function( element )
+                                                        {
+                                                                if( element.attributes[ '_cke_bogus' ] )
+                                                                        return false;
+                                                        }
+                                                }
+                                        }, 5 );
                                 });
                 }
         });