WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customize: Prevent `color` default control type from overriding template for `ColorControl`. 

Amends [41771].
See #30738.

Built from https://develop.svn.wordpress.org/trunk@41778


git-svn-id: http://core.svn.wordpress.org/trunk@41612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-10-05 14:36:57 +00:00
parent 766db88eb9
commit b6297d1866
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/js/customize-controls.js
View File

@ -3183,7 +3183,6 @@
standardTypes = [ standardTypes = [
'button', 'button',
'checkbox', 'checkbox',
'color',
'date', 'date',
'datetime-local', 'datetime-local',
'email', 'email',

6
wp-admin/js/customize-controls.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-beta1-41777'; $wp_version = '4.9-beta1-41778';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.