Ticket #2765: 2765_5.patch

_source/core/htmlparser/element.js

@@ -113 +113 @@
                         {
                                 var attrib = attribsArray[ i ];
                                 // IE's treated expand fields as dom attributes, skip it
-                                if ( CKEDITOR.env.ie && attrib === '_cke_expando' )
+                                if ( CKEDITOR.env.ie && attrib[0] === '_cke_expando' )
                                         continue;
                                 writer.attribute( attrib[0], attrib[1] );
                         }

_source/plugins/fakeobjects/plugin.js

@@ -8 +8 @@
  *      in WYSIWYG mode.
  */
 
-(function()
+CKEDITOR.plugins.add( 'fakeobjects',
+                {
+                        init : function( editor, pluginPath )
+                        {
+                                (function()
 {
         var flashExtensionRegex = /\.swf($|#|\?)/i,
                 emptyElements = { base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },
@@ -346 +350 @@
                                                 innerParser.parse( protectedHtml );
                                                 protectedHtml = innerParser.output.join( '' );
                                         }
+                                        
+                                        //Format protected html which skip plugin:wysiwyg default logic 
+                                        if ( editor.dataProcessor )
+                                                protectedHtml = editor.dataProcessor.toDataFormat( protectedHtml );
 
                                         this.output.push( protectedHtml );
                                         return;
@@ -397 +405 @@
                 }
         };
 
-        CKEDITOR.plugins.add( 'fakeobjects',
-                {
-                        init : function( editor, pluginPath )
-                        {
+})();
                                 editor.fakeobjects = new CKEDITOR.plugins.fakeobjects();
                         }
                 } );
-})();
+

_source/plugins/htmldataprocessor/plugin.js

@@ -25 +25 @@
                 // The source data is already HTML, so just return it as is.
                 return data;
         },
-
-        toDataFormat : function( element )
+        
+        /**
+         * 
+         * @param {CKEDITOR.dom.element|String} source
+         */
+        toDataFormat : function( source )
         {
                 var writer = this.writer,
-                        fragment = CKEDITOR.htmlParser.fragment.fromHtml( element.getHtml() );
+                        fragment = CKEDITOR.htmlParser.fragment.fromHtml( source.type?source.getHtml() : source);
 
                 writer.reset();