Ticket #6046: 6046.patch

_source/core/dom/node.js

@@ -666 +666 @@
                         {
                                 if ( current.type == CKEDITOR.NODE_ELEMENT )
                                 {
-                                        if ( current.is ( 'body' ) )
+                                        if ( current.is( 'body' ) || current.getCustomData( '_cke_lockedInput' ) )
                                                 break;
 
                                         if ( current.getAttribute( 'contentEditable' ) == 'false' )

_source/plugins/wysiwygarea/plugin.js

@@ -995 +995 @@
                                 if ( element.type == CKEDITOR.NODE_ELEMENT
                                                 && ( element.is( 'input' ) || element.is( 'textarea' ) ) )
                                 {
-                                        element.setAttribute( 'contentEditable', false );
+                                        if ( !element.isReadOnly() )
+                                        {
+                                                element.setAttribute( 'contentEditable', false );
+                                                // We should flag that the element was locked by our code so
+                                                // it'll be editable by the editor functions (#6046).
+                                                element.setCustomData( '_cke_lockedInput', true );
+                                        }
                                 }
                         });