Ticket #6116: 6116.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -132 +132 @@
                                                 if ( attribs.cke_temp )
                                                         return false;
 
-                                                // Remove duplicated attributes - #3789.
-                                                var attributeNames = [ 'name', 'href', 'src' ],
+                                                // Remove duplicated attributes (#3789).
+                                                // Also protect the contentEditable attribute so it won't get lost by our modifications (#6116).
+                                                var attributeNames = [ 'name', 'href', 'src', 'contenteditable' ],
                                                         savedAttributeName;
                                                 for ( var i = 0 ; i < attributeNames.length ; i++ )
                                                 {
@@ -263 +264 @@
                 defaultHtmlFilterRules.elements[ i ] = unprotectReadyOnly;
         }
 
-        var protectAttributeRegex = /<(?:a|area|img|input)[\s\S]*?\s((?:href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi;
+        var protectAttributeRegex = /<(?:a|area|img|input|textarea)[\s\S]*?\s((?:href|src|name|contenteditable)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi;
 
         var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
                 encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;