Fix theme.json colors custom config

WordPress · Aug 28, 2020 · ce8f026 · ce8f026
1 parent cc0465e
commit ce8f026
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/global-styles.php b/lib/global-styles.php
@@ -604,11 +604,11 @@ function gutenberg_experimental_global_styles_get_editor_features( $config ) {
 	}
 
 	// Deprecated theme supports.
-	if ( null !== get_theme_support( 'disable-custom-colors' ) ) {
+	if ( get_theme_support( 'disable-custom-colors' ) ) {
 		if ( ! isset( $config['global']['features']['colors'] ) ) {
 			$config['global']['features']['colors'] = array();
 		}
-		$config['global']['features']['colors']['custom'] = ! get_theme_support( 'disable-custom-colors' );
+		$config['global']['features']['colors']['custom'] = false;
 	}
 
 	return $config['global']['features'];
@@ -641,6 +641,8 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
 	$settings['styles'][] = array( 'css' => $stylesheet );
 
 	$settings['__experimentalFeatures'] = gutenberg_experimental_global_styles_get_editor_features( $merged );
+	// Unsetting deprecated settings defined by Core.
+	unset( $settings[ 'disableCustomColors' ] );
 
 	return $settings;
 }