Ticket #5528: 5528.patch

plugins/htmldataprocessor/plugin.js

@@ -132 +132 @@
                                                         return false;
 
                                                 // Remove duplicated attributes - #3789.
-                                                var attributeNames = [ 'name', 'href', 'src' ],
+                                                var attributeNames = [ 'name', 'href', 'src', 'style' ],
                                                         savedAttributeName;
                                                 for ( var i = 0 ; i < attributeNames.length ; i++ )
                                                 {
@@ -230 +230 @@
         for ( i in blockLikeTags )
                 defaultHtmlBlockFilterRules.elements[ i ] = extendBlockForOutput;
 
-        if ( CKEDITOR.env.ie )
-        {
-                // IE outputs style attribute in capital letters. We should convert
-                // them back to lower case.
-                defaultHtmlFilterRules.attributes.style = function( value, element )
-                {
-                        return value.toLowerCase();
-                };
-        }
-
         var protectAttributeRegex = /<(?:a|area|img|input)[\s\S]*?\s((?:href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi;
+        var protectStyleRegex = /\s(style\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi;
 
         var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
                 encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;
@@ -252 +243 @@
 
         function protectAttributes( html )
         {
-                return html.replace( protectAttributeRegex, '$& _cke_saved_$1' );
+                return html.replace( protectAttributeRegex, '$& _cke_saved_$1' ).replace( protectStyleRegex, '$& _cke_saved_$1' );
         }
 
         function protectElements( html )