@@ -270,7 +309,8 @@ function( $block ) {
__( 'Open menu' ), // Open button label.
__( 'Close menu' ), // Close button label.
implode( ' ', $responsive_container_classes ),
- implode( ' ', $open_button_classes )
+ implode( ' ', $open_button_classes ),
+ $colors['overlay_inline_styles']
);
return sprintf(
diff --git a/src/wp-includes/blocks/page-list.php b/src/wp-includes/blocks/page-list.php
index 733d2e0e4354..53dec1f1957e 100644
--- a/src/wp-includes/blocks/page-list.php
+++ b/src/wp-includes/blocks/page-list.php
@@ -34,7 +34,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
if ( $has_named_text_color ) {
// Add the color class.
- $colors['css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['textColor'] ) );
+ $colors['css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['textColor'] ) );
} elseif ( $has_picked_text_color ) {
$colors['inline_styles'] .= sprintf( 'color: %s;', $context['customTextColor'] );
} elseif ( $has_custom_text_color ) {
@@ -55,7 +55,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
if ( $has_named_background_color ) {
// Add the background-color class.
- $colors['css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['backgroundColor'] ) );
+ $colors['css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['backgroundColor'] ) );
} elseif ( $has_picked_background_color ) {
$colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['customBackgroundColor'] );
} elseif ( $has_custom_background_color ) {
@@ -74,7 +74,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
// Give overlay colors priority, fall back to Navigation block colors, then global styles.
if ( $has_named_overlay_text_color ) {
- $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['overlayTextColor'] ) );
+ $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['overlayTextColor'] ) );
} elseif ( $has_picked_overlay_text_color ) {
$colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $context['customOverlayTextColor'] );
}
@@ -89,7 +89,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
}
if ( $has_named_overlay_background_color ) {
- $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['overlayBackgroundColor'] ) );
+ $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['overlayBackgroundColor'] ) );
} elseif ( $has_picked_overlay_background_color ) {
$colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $context['customOverlayBackgroundColor'] );
}
@@ -182,7 +182,7 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
) . '' .
'';
} else {
- $markup .= '
' . wp_kses(
+ $markup .= '' . wp_kses(
$page['title'],
wp_kses_allowed_html( 'post' )
) . '';
diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index f0a12e92fcbf..2319aef90186 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -136,7 +136,7 @@ public static function get_core_data() {
$config = self::read_json_file( __DIR__ . '/theme.json' );
$config = self::translate( $config );
- self::$core = new WP_Theme_JSON( $config, 'core' );
+ self::$core = new WP_Theme_JSON( $config, 'default' );
return self::$core;
}
@@ -182,7 +182,32 @@ public static function get_theme_data( $deprecated = array() ) {
* So we take theme supports, transform it to theme.json shape
* and merge the self::$theme upon that.
*/
- $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+ $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+ if ( ! self::theme_has_support() ) {
+ if ( ! isset( $theme_support_data['settings']['color'] ) ) {
+ $theme_support_data['settings']['color'] = array();
+ }
+
+ $default_palette = false;
+ if ( current_theme_supports( 'default-color-palette' ) ) {
+ $default_palette = true;
+ }
+ if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
+ // If the theme does not have any palette, we still want to show the core one.
+ $default_palette = true;
+ }
+ $theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
+
+ $default_gradients = false;
+ if ( current_theme_supports( 'default-gradient-presets' ) ) {
+ $default_gradients = true;
+ }
+ if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
+ // If the theme does not have any gradients, we still want to show the core ones.
+ $default_gradients = true;
+ }
+ $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
+ }
$with_theme_supports = new WP_Theme_JSON( $theme_support_data );
$with_theme_supports->merge( self::$theme );
@@ -293,7 +318,7 @@ public static function get_user_data() {
/**
* There are three sources of data (origins) for a site:
- * core, theme, and user. The user's has higher priority
+ * default, theme, and user. The user's has higher priority
* than the theme's, and the theme's higher than core's.
*
* Unlike the getters {@link get_core_data},
diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index 894e0bfa0fbe..455eca675c6b 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -51,7 +51,7 @@ class WP_Theme_JSON {
* @var string[]
*/
const VALID_ORIGINS = array(
- 'core',
+ 'default',
'theme',
'user',
);
@@ -220,15 +220,17 @@ class WP_Theme_JSON {
'width' => null,
),
'color' => array(
- 'background' => null,
- 'custom' => null,
- 'customDuotone' => null,
- 'customGradient' => null,
- 'duotone' => null,
- 'gradients' => null,
- 'link' => null,
- 'palette' => null,
- 'text' => null,
+ 'background' => null,
+ 'custom' => null,
+ 'customDuotone' => null,
+ 'customGradient' => null,
+ 'defaultGradients' => null,
+ 'defaultPalette' => null,
+ 'duotone' => null,
+ 'gradients' => null,
+ 'link' => null,
+ 'palette' => null,
+ 'text' => null,
),
'custom' => null,
'layout' => array(
@@ -324,7 +326,7 @@ class WP_Theme_JSON {
*
* @param array $theme_json A structure that follows the theme.json schema.
* @param string $origin Optional. What source of data this object represents.
- * One of 'core', 'theme', or 'user'. Default 'theme'.
+ * One of 'default', 'theme', or 'user'. Default 'theme'.
*/
public function __construct( $theme_json = array(), $origin = 'theme' ) {
if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
@@ -343,7 +345,9 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
$path = array_merge( $node['path'], $preset_metadata['path'] );
$preset = _wp_array_get( $this->theme_json, $path, null );
if ( null !== $preset ) {
- _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
+ if ( 'user' !== $origin || isset( $preset[0] ) ) {
+ _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
+ }
}
}
}
@@ -1472,46 +1476,48 @@ public static function remove_insecure_properties( $theme_json ) {
private static function remove_insecure_settings( $input ) {
$output = array();
foreach ( self::PRESETS_METADATA as $preset_metadata ) {
- $presets = _wp_array_get( $input, $preset_metadata['path'], null );
- if ( null === $presets ) {
- continue;
- }
+ foreach ( self::VALID_ORIGINS as $origin ) {
+ $path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) );
+ $presets = _wp_array_get( $input, $path_with_origin, null );
+ if ( null === $presets ) {
+ continue;
+ }
- $escaped_preset = array();
- foreach ( $presets as $preset ) {
- if (
- esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
- sanitize_html_class( $preset['slug'] ) === $preset['slug']
- ) {
- $value = null;
- if ( isset( $preset_metadata['value_key'] ) ) {
- $value = $preset[ $preset_metadata['value_key'] ];
- } elseif (
- isset( $preset_metadata['value_func'] ) &&
- is_callable( $preset_metadata['value_func'] )
+ $escaped_preset = array();
+ foreach ( $presets as $preset ) {
+ if (
+ esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
+ sanitize_html_class( $preset['slug'] ) === $preset['slug']
) {
- $value = call_user_func( $preset_metadata['value_func'], $preset );
- }
+ $value = null;
+ if ( isset( $preset_metadata['value_key'] ) ) {
+ $value = $preset[ $preset_metadata['value_key'] ];
+ } elseif (
+ isset( $preset_metadata['value_func'] ) &&
+ is_callable( $preset_metadata['value_func'] )
+ ) {
+ $value = call_user_func( $preset_metadata['value_func'], $preset );
+ }
- $preset_is_valid = true;
- foreach ( $preset_metadata['properties'] as $property ) {
- if ( ! self::is_safe_css_declaration( $property, $value ) ) {
- $preset_is_valid = false;
- break;
+ $preset_is_valid = true;
+ foreach ( $preset_metadata['properties'] as $property ) {
+ if ( ! self::is_safe_css_declaration( $property, $value ) ) {
+ $preset_is_valid = false;
+ break;
+ }
}
- }
- if ( $preset_is_valid ) {
- $escaped_preset[] = $preset;
+ if ( $preset_is_valid ) {
+ $escaped_preset[] = $preset;
+ }
}
}
- }
- if ( ! empty( $escaped_preset ) ) {
- _wp_array_set( $output, $preset_metadata['path'], $escaped_preset );
+ if ( ! empty( $escaped_preset ) ) {
+ _wp_array_set( $output, $path_with_origin, $escaped_preset );
+ }
}
}
-
return $output;
}
diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php
index ad4e87a45c01..303f004bf68a 100644
--- a/src/wp-includes/global-styles-and-settings.php
+++ b/src/wp-includes/global-styles-and-settings.php
@@ -105,14 +105,14 @@ function wp_get_global_stylesheet( $types = array() ) {
$types = array( 'variables', 'styles', 'presets' );
}
- $origins = array( 'core', 'theme', 'user' );
+ $origins = array( 'default', 'theme', 'user' );
if ( ! $supports_theme_json && ! $supports_link_color ) {
// In this case we only enqueue the core presets (CSS Custom Properties + the classes).
- $origins = array( 'core' );
+ $origins = array( 'default' );
} elseif ( ! $supports_theme_json && $supports_link_color ) {
// For the legacy link color feature to work, the CSS Custom Properties
// should be in scope (either the core or the theme ones).
- $origins = array( 'core', 'theme' );
+ $origins = array( 'default', 'theme' );
}
$tree = WP_Theme_JSON_Resolver::get_merged_data();
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 73e188c8c935..a51d616416e0 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -357,7 +357,7 @@ function create_initial_post_types() {
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
'has_archive' => false,
'show_ui' => wp_is_block_template_theme(),
- 'show_in_menu' => 'themes.php',
+ 'show_in_menu' => false,
'show_in_rest' => true,
'rewrite' => false,
'rest_base' => 'templates',
@@ -416,7 +416,7 @@ function create_initial_post_types() {
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
'has_archive' => false,
'show_ui' => wp_is_block_template_theme(),
- 'show_in_menu' => 'themes.php',
+ 'show_in_menu' => false,
'show_in_rest' => true,
'rewrite' => false,
'rest_base' => 'template-parts',
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index cc0763bbac08..85b5cd3d44c9 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -76,7 +76,7 @@ public function test_get_settings() {
* @ticket 53397
*/
public function test_get_settings_presets_are_keyed_by_origin() {
- $core_origin = new WP_Theme_JSON(
+ $default_origin = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
@@ -103,9 +103,9 @@ public function test_get_settings_presets_are_keyed_by_origin() {
),
),
),
- 'core'
+ 'default'
);
- $no_origin = new WP_Theme_JSON(
+ $no_origin = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
@@ -134,15 +134,15 @@ public function test_get_settings_presets_are_keyed_by_origin() {
)
);
- $actual_core = $core_origin->get_raw_data();
+ $actual_default = $default_origin->get_raw_data();
$actual_no_origin = $no_origin->get_raw_data();
- $expected_core = array(
+ $expected_default = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'palette' => array(
- 'core' => array(
+ 'default' => array(
array(
'slug' => 'white',
'color' => 'white',
@@ -154,7 +154,7 @@ public function test_get_settings_presets_are_keyed_by_origin() {
'core/group' => array(
'color' => array(
'palette' => array(
- 'core' => array(
+ 'default' => array(
array(
'slug' => 'white',
'color' => 'white',
@@ -196,7 +196,7 @@ public function test_get_settings_presets_are_keyed_by_origin() {
),
);
- $this->assertEqualSetsWithIndex( $expected_core, $actual_core );
+ $this->assertEqualSetsWithIndex( $expected_default, $actual_default );
$this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
}
@@ -593,7 +593,7 @@ public function test_get_stylesheet_preset_values_are_marked_as_important() {
),
),
),
- 'core'
+ 'default'
);
$this->assertEquals(
@@ -1298,20 +1298,22 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
'color' => array(
'custom' => true,
'palette' => array(
- array(
- 'name' => 'Red',
- 'slug' => 'red',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Green',
- 'slug' => 'green',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Blue',
- 'slug' => 'blue',
- 'color' => '#0000ff',
+ 'user' => array(
+ array(
+ 'name' => 'Red',
+ 'slug' => 'red',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Green',
+ 'slug' => 'green',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Blue',
+ 'slug' => 'blue',
+ 'color' => '#0000ff',
+ ),
),
),
),
@@ -1323,20 +1325,22 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
'color' => array(
'custom' => true,
'palette' => array(
- array(
- 'name' => 'Yellow',
- 'slug' => 'yellow',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Orange',
- 'slug' => 'orange',
- 'color' => '#0000ff',
+ 'user' => array(
+ array(
+ 'name' => 'Yellow',
+ 'slug' => 'yellow',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Orange',
+ 'slug' => 'orange',
+ 'color' => '#0000ff',
+ ),
),
),
),
@@ -1354,20 +1358,22 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
'settings' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Red',
- 'slug' => 'red',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Green',
- 'slug' => 'green',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Blue',
- 'slug' => 'blue',
- 'color' => '#0000ff',
+ 'user' => array(
+ array(
+ 'name' => 'Red',
+ 'slug' => 'red',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Green',
+ 'slug' => 'green',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Blue',
+ 'slug' => 'blue',
+ 'color' => '#0000ff',
+ ),
),
),
),
@@ -1375,20 +1381,22 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
'core/group' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Yellow',
- 'slug' => 'yellow',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Orange',
- 'slug' => 'orange',
- 'color' => '#0000ff',
+ 'user' => array(
+ array(
+ 'name' => 'Yellow',
+ 'slug' => 'yellow',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Orange',
+ 'slug' => 'orange',
+ 'color' => '#0000ff',
+ ),
),
),
),
@@ -1409,49 +1417,53 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
'settings' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Red/>
ok',
- 'slug' => 'red',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Green',
- 'slug' => 'a" attr',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Blue',
- 'slug' => 'blue',
- 'color' => 'var(--color, var(--unsafe-fallback))',
- ),
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#FFC0CB',
+ 'user' => array(
+ array(
+ 'name' => 'Red/>ok',
+ 'slug' => 'red',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Green',
+ 'slug' => 'a" attr',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Blue',
+ 'slug' => 'blue',
+ 'color' => 'var(--color, var(--unsafe-fallback))',
+ ),
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#FFC0CB',
+ ),
),
),
),
'typography' => array(
'fontFamilies' => array(
- array(
- 'name' => 'Helvetica Arial/>test',
- 'slug' => 'helvetica-arial',
- 'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
- ),
- array(
- 'name' => 'Geneva',
- 'slug' => 'geneva#asa',
- 'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
- ),
- array(
- 'name' => 'Cambria',
- 'slug' => 'cambria',
- 'fontFamily' => 'Cambria, Georgia, serif',
- ),
- array(
- 'name' => 'Helvetica Arial',
- 'slug' => 'helvetica-arial',
- 'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
+ 'user' => array(
+ array(
+ 'name' => 'Helvetica Arial/>test',
+ 'slug' => 'helvetica-arial',
+ 'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
+ ),
+ array(
+ 'name' => 'Geneva',
+ 'slug' => 'geneva#asa',
+ 'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
+ ),
+ array(
+ 'name' => 'Cambria',
+ 'slug' => 'cambria',
+ 'fontFamily' => 'Cambria, Georgia, serif',
+ ),
+ array(
+ 'name' => 'Helvetica Arial',
+ 'slug' => 'helvetica-arial',
+ 'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
+ ),
),
),
),
@@ -1459,25 +1471,27 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
'core/group' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Red/>ok',
- 'slug' => 'red',
- 'color' => '#ff0000',
- ),
- array(
- 'name' => 'Green',
- 'slug' => 'a" attr',
- 'color' => '#00ff00',
- ),
- array(
- 'name' => 'Blue',
- 'slug' => 'blue',
- 'color' => 'var(--color, var(--unsafe--fallback))',
- ),
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#FFC0CB',
+ 'user' => array(
+ array(
+ 'name' => 'Red/>ok',
+ 'slug' => 'red',
+ 'color' => '#ff0000',
+ ),
+ array(
+ 'name' => 'Green',
+ 'slug' => 'a" attr',
+ 'color' => '#00ff00',
+ ),
+ array(
+ 'name' => 'Blue',
+ 'slug' => 'blue',
+ 'color' => 'var(--color, var(--unsafe--fallback))',
+ ),
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#FFC0CB',
+ ),
),
),
),
@@ -1492,19 +1506,23 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
'settings' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#FFC0CB',
+ 'user' => array(
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#FFC0CB',
+ ),
),
),
),
'typography' => array(
'fontFamilies' => array(
- array(
- 'name' => 'Cambria',
- 'slug' => 'cambria',
- 'fontFamily' => 'Cambria, Georgia, serif',
+ 'user' => array(
+ array(
+ 'name' => 'Cambria',
+ 'slug' => 'cambria',
+ 'fontFamily' => 'Cambria, Georgia, serif',
+ ),
),
),
),
@@ -1512,10 +1530,12 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
'core/group' => array(
'color' => array(
'palette' => array(
- array(
- 'name' => 'Pink',
- 'slug' => 'pink',
- 'color' => '#FFC0CB',
+ 'user' => array(
+ array(
+ 'name' => 'Pink',
+ 'slug' => 'pink',
+ 'color' => '#FFC0CB',
+ ),
),
),
),
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index fadfa11c47f4..7a9f326ee105 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -147,8 +147,8 @@ public function test_translations_are_applied() {
* @ticket 52991
*/
public function test_switching_themes_recalculates_data() {
- // By default, the theme for unit tests is "default",
- // which doesn't have theme.json support.
+ // The "default" theme doesn't have theme.json support.
+ switch_theme( 'default' );
$default = WP_Theme_JSON_Resolver::theme_has_support();
// Switch to a theme that does have support.