Ticket #3918: 3918.patch

_source/plugins/removeformat/plugin.js

@@ -92 +92 @@
                                                 var nextNode = currentNode.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT );
 
                                                 // This node must not be a fake element.
-                                                if ( currentNode.getName() != 'img' || !currentNode.getAttribute( '_cke_protected_html' ) )
+                                                if ( !( currentNode.getName() == 'img' && currentNode.getAttribute( '_cke_realelement' ) ) )
                                                 {
                                                         // Remove elements nodes that match with this style rules.
                                                         if ( tagsRegex.test( currentNode.getName() ) )

_source/plugins/image/dialogs/image.js

@@ -242 +242 @@
                                                 this.setupContent( LINK, link );
                                 }
 
-                                if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_protected_html' ) )
+                                if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_realelement' ) )
                                         this.imageEditMode = 'img';
                                 else if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) && element.getAttribute( 'type' ) == 'image' )
                                         this.imageEditMode = 'input';