Ticket #5368: 5368.patch

_source/plugins/wysiwygarea/plugin.js

@@ -254 +254 @@
                         if ( !CKEDITOR.env.ie )
                                 paddingBlock.appendBogus();
                 }
-                
+
                 range.select();
                 editor.selectionChange();
         }
@@ -677 +677 @@
                                                                 data += activationScript;
 
                                                                 CKEDITOR._[ 'contentDomReady' + editor.name ] = contentDomReady;
+
+                                                                // The iframe is recreated on each call of setData, so we need to clear DOM objects
+                                                                this.clearCustomData();
                                                                 createIFrame( data );
                                                         },
 
@@ -714 +717 @@
                                                                 iframe.getFrameDocument().getBody().setHtml( data );
                                                         },
 
-                                                        unload : function( holderElement )
+                                                        clearCustomData : function()
                                                         {
+                                                                if ( !editor.document )
+                                                                        return;
+
                                                                 editor.document.getDocumentElement().clearCustomData();
                                                                 editor.document.getBody().clearCustomData();
 
                                                                 editor.window.clearCustomData();
                                                                 editor.document.clearCustomData();
 
+                                                                iframe.clearCustomData();
+                                                        },
+
+                                                        unload : function( holderElement )
+                                                        {
+                                                                this.clearCustomData();
+
                                                                 editor.window = editor.document = iframe = mainElement = isPendingFocus = null;
 
                                                                 editor.fire( 'contentDomUnload' );