Ticket #5931: 5931.patch

plugin.js

@@ -504 +504 @@
 
                                                 if ( !styleNode.hasAttributes() )
                                                 {
-                                                        styleNode = null;
+                                                        // styleNode = null;
+                                                        // Allow through these potentially empty tags, they will be added, then removed (#5931)
                                                         break;
                                                 }
                                         }
@@ -536 +537 @@
                                         // We should try to normalize with IE too in some way, somewhere.
                                         if ( !CKEDITOR.env.ie )
                                                 styleNode.$.normalize();
+                                        
+                                        // Since we may have allowed through now emtpy tags, remove them if they are such.
+                                        // Thus we allow them to be merged back up to their parents (#5931)
+                                        if ( !styleNode.hasAttributes() )
+                                                                removeNoAttribsElement(styleNode);
                                 }
 
                                 // Style applied, let's release the range, so it gets