Ticket #3019: 3019.patch

_source/plugins/selection/plugin.js

@@ -201 +201 @@
                 };
         };
 
-        var styleObjectElements = { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 };
+        var styleObjectElements = 
+        { 
+                img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1,
+                a:1, input:1, form:1, select:1, textarea:1, button:1, fieldset:1, th:1, thead:1, tfoot:1
+        };
 
         CKEDITOR.dom.selection.prototype =
         {

_source/plugins/forms/dialogs/textfield.js

@@ -15 +15 @@
                         this.restoreSelection();
 
                         var element = this.getParentEditor().getSelection().getSelectedElement();
-                        if ( element && element.getName() == "input" && ( element.getAttribute( 'type' ) == "text" && !element.getAttribute( 'type' ) ) )
+                        if ( element && element.getName() == "input" && ( element.getAttribute( 'type' ) == "text" || !element.getAttribute( 'type' ) ) )
                         {
                                 this._element = element;
                                 this.setupContent( element );