Ticket #5121: 5121_2.patch

_source/plugins/styles/plugin.js

@@ -110 +110 @@
 
         CKEDITOR.style.prototype =
         {
+                setEditor : function( editor )
+                {
+                        this._.editor = editor;
+                },
+
                 apply : function( document )
                 {
                         applyStyle.call( this, document, false );
@@ -752 +757 @@
 
                 var iterator = range.createIterator();
                 iterator.enforceRealBlocks = true;
+                iterator.enlargeBr = ( this._.editor.config.enterMode != CKEDITOR.ENTER_BR );
 
                 var block;
                 var doc = range.document;

_source/plugins/stylescombo/plugin.js

@@ -102 +102 @@
 
                                                 var style = styles[ value ],
                                                         selection = editor.getSelection();
-
+                                                
                                                 var elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() );
 
+                                                style.setEditor( editor );
+
                                                 if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
                                                         style.remove( editor.document );
                                                 else