Ticket #7092: 7092_2.patch

_source/plugins/styles/plugin.js

@@ -61 +61 @@
                                         // callback.
                                         var currentState = callback.style.checkActive( ev.data.path ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
 
-                                        // If the state changed since the last check.
-                                        if ( callback.state !== currentState )
-                                        {
-                                                // Call the callback function, passing the current
-                                                // state to it.
-                                                callback.fn.call( this, currentState );
-
-                                                // Save the current state, so it can be compared next
-                                                // time.
-                                                callback.state = currentState;
-                                        }
-                                }
+                                        // Call the callback function, passing the current
+                                        // state to it.
+                                        callback.fn.call( this, currentState );
+                                }
                         });
         }
 
@@ -703 +695 @@
                                                  * them before removal.
                                                  */
                                                 element.mergeSiblings();
-                                                removeFromElement( this, element );
-
+                                                if ( element.getName() == this.element )
+                                                        removeFromElement( this, element );
+                                                else
+                                                        removeOverrides( element, getOverrides( this )[ element.getName() ] );
                                         }
                                 }
                         }