Ticket #4746: 4746_2.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -84 +84 @@
         delete blockLikeTags.pre;
         var defaultDataFilterRules =
         {
-                elements : {},
+                elements :
+                {
+                        '$' : function( element )
+                        {
+                                var attribs = element.attributes;
+                                // Elements marked as temporary are to be ignored.
+                                if ( attribs.cke_temp )
+                                        return false;
+
+                                // Elements marked as contextual keep only contents. (#4746)
+                                if ( attribs.cke_context )
+                                        delete element.name;
+
+                                return element;
+                        }
+                },
                 attributeNames :
                 [
                         // Event attributes (onXYZ) must not be directly set. They can become

_source/plugins/wysiwygarea/plugin.js

@@ -32 +32 @@
                 {
                         this.focus();
 
-                        var selection = this.getSelection();
+                        var selection = this.getSelection(),
+                                start = selection.getStartElement(),
+                                data = evt.data;
+
                         if ( checkReadOnly( selection ) )
                                 return;
 
                         var data = evt.data;
                         this.fire( 'saveSnapshot' );
 
+                        // Creating a 'has inline started' parsing context for the inserted HTML,
+                        // This's because we expect leading spaces are left untouched. (#4767)
+                        data = '<span cke_temp="1">\ufeff</span>' + data;
+                        // Creating proper context for insertion happens inside preformatted block.
+                        if ( start.hasAscendant( 'pre', true ) )
+                                data = '<pre cke_context="1">' + data + '</pre>';
+
                         if ( this.dataProcessor )
                                 data = this.dataProcessor.toHtml( data );