Ticket #7870: 7870.patch

_source/plugins/bbcode/plugin.js

@@ -557 +557 @@
                                 if ( tag in bbcodeMap )
                                 {
                                         if ( this.getRule( tag, 'breakBeforeOpen' ) )
-                                                this.lineBreak( 1 );
+                                                this.lineBreak();
 
                                         this.write( '[', tag );
                                         var option = attributes.option;
@@ -565 +565 @@
                                         this.write( ']' );
 
                                         if ( this.getRule( tag, 'breakAfterOpen' ) )
-                                                this.lineBreak( 1 );
+                                                this.lineBreak();
                                 }
                                 else if ( tag == 'br' )
                                         this._.output.push( '\n' );
+                                else if ( tag == 'block' )
+                                        this.lineBreak();
                         },
 
                         openTagClose : function() { },
@@ -579 +581 @@
                                 if ( tag in bbcodeMap )
                                 {
                                         if ( this.getRule( tag, 'breakBeforeClose' ) )
-                                                this.lineBreak( 1 );
+                                                this.lineBreak();
 
                                         tag != '*' && this.write( '[/', tag, ']' );
 
                                         if ( this.getRule( tag, 'breakAfterClose' ) )
-                                                this.lineBreak( 1 );
+                                                this.lineBreak();
                                 }
+                                else if ( tag == 'block' )
+                                        this.lineBreak();
                         },
 
                         text : function( text )
@@ -603 +607 @@
                         comment : function() {},
 
                         /*
-                        * Output line-break for formatting.
+                        * Output a soft line-break for formatting, it only introduces
+                        * real line-break only when there's no existence.
                          */
                         lineBreak : function()
                         {
@@ -852 +857 @@
                                                         else
                                                                 element.children = [ new CKEDITOR.htmlParser.text( src ) ];
                                                 }
+                                                // "block" is just a formatting element lives outside of bbcode map,
+                                                // whose tag name will not be outputted, just wraps content with line-breaks. (#7870)
+                                                else if ( tagName in CKEDITOR.dtd.$block )
+                                                        tagName = 'block';
 
                                                 element.name = tagName;
                                                 value && ( element.attributes.option = value );