Ticket #3591: 3591.patch

plugins/fakeobjects/plugin.js

@@ -77 +77 @@
         return this.document.createElement( 'img', { attributes : attributes } );
 };
 
-CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable )
+CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable, enableFilter )
 {
-        var writer = new CKEDITOR.htmlParser.basicWriter();
+        var writer = new CKEDITOR.htmlParser.basicWriter(),
+                filter = enableFilter? this.dataProcessor.dataFilter : null;
+        realElement.writeHtml( writer, filter );
 
-        realElement.writeHtml( writer );
-
         var html = writer.getHtml();
 
         var attributes =

plugins/flash/plugin.js

@@ -22 +22 @@
                 return ( attributes.type != 'application/x-shockwave-flash' || !flashFilenameRegex.test( attributes.src || '' ) );
         }
 
-        function createFakeElement( editor, realElement )
+        function createFakeElement( editor, realElement, enableFilter )
         {
-                var fakeElement = editor.createFakeParserElement( realElement, 'cke_flash', 'flash', true ),
+                var fakeElement = editor.createFakeParserElement( realElement, 'cke_flash', 'flash', true, true ),
                         fakeStyle = fakeElement.attributes.style || '';
 
                 var width = realElement.attributes.width,
@@ -99 +99 @@
                                         {
                                                 elements :
                                                 {
-                                                        'cke:object' : function( element )
+                                                        'cke:object' : function( element, filter )
                                                         {
                                                                 var attributes = element.attributes,
                                                                         classId = attributes.classid && String( attributes.classid ).toLowerCase();
@@ -119 +119 @@
                                                                         }
                                                                         return null;
                                                                 }
-
-                                                                return createFakeElement( editor, element );
+                                                                // Contents of <cke:object> need to be filtered also.(#3591)
+                                                                // We temporarily disable this filter now.  
+                                                                filter._.elements[ 'cke:object' ] = null;
+                                                                var fake = createFakeElement( editor, element, true );
+                                                                filter._.elements[ 'cke:object' ] = arguments.callee;
+                                                                return fake;
                                                         },
 
                                                         'cke:embed' : function( element )