Changeset 41952

Timestamp:

10/20/2017 03:29:30 AM (7 years ago)

Author:

westonruter

Message:

Customize: Prevent using default template for a base control when it has content rendered on the server.

Also prevent invalid type attribute from being added to a select element.

See #30738.
Fixes #42286.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

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

@@ -3898 +3898 @@
             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';
             }

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

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