Ticket #7146: 7146.patch

_source/plugins/clipboard/plugin.js

@@ -237 +237 @@
 
                         // Grab the HTML contents.
                         // We need to look for a apple style wrapper on webkit it also adds
-                        // a div wrapper if you copy/paste the body of the editor.
+                        // a div wrapper if you copy/paste the body of the editor (#7146).
                         // Remove hidden div and restore selection.
-                        var bogusSpan;
+                        var bogus;
                         pastebin = ( CKEDITOR.env.webkit
-                                                 && ( bogusSpan = pastebin.getFirst() )
-                                                 && ( bogusSpan.is && bogusSpan.hasClass( 'Apple-style-span' ) ) ?
-                                                        bogusSpan : pastebin );
+                                                 && ( bogus = pastebin.getFirst() )
+                                                 && bogus.type == CKEDITOR.NODE_ELEMENT
+                                                 && ( bogus.hasClass( 'Apple-style-span' )
+                                                                || bogus.is( 'div' ) && bogus.getStyle( 'background-color' ) == 'rgb(255, 255, 255)' ) ?
+                                                        bogus : pastebin );
 
                         sel.selectBookmarks( bms );
                         callback( pastebin[ 'get' + ( mode == 'text' ? 'Value' : 'Html' ) ]() );