Ticket #30738: 30738.4.diff

src/wp-admin/js/customize-controls.js

@@ -3897 +3897 @@
 
                         templateId = control.templateSelector;
 
-                        // Use default content template when a standard HTML type is used and there isn't a more specific template existing.
-                        if ( templateId === 'customize-control-' + control.params.type + '-content' && _.contains( standardTypes, control.params.type ) && ! document.getElementById( 'tmpl-' + templateId ) ) {
+                        // Use default content template when a standard HTML type is used, there isn't a more specific template existing, and the control container is empty.
+                        if (
+                                templateId === 'customize-control-' + control.params.type + '-content'
+                                &&
+                                _.contains( standardTypes, control.params.type )
+                                &&
+                                ! document.getElementById( 'tmpl-' + templateId )
+                                &&
+                                0 === control.container.children().length
+                        ) {
                                 templateId = 'customize-control-default-content';
                         }
 

src/wp-includes/class-wp-customize-manager.php

@@ -4019 +4019 @@
                                                         <# }); #>
                                                 >{{ inputAttrs.value }}</textarea>
                                         <# } else if ( 'select' === data.type ) { #>
+                                                <# delete inputAttrs.type; #>
                                                 <select
                                                         <# _.each( _.extend( inputAttrs ), function( value, key ) { #>
                                                                 {{{ key }}}="{{ value }}"