mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-29 23:57:41 +02:00
Ignore unregistered block style variations from theme.json
.
This PR makes sure unregistered block style variations declared via `theme.json` are ignored. It fixes an issue by style variations don't work in the editor and CSS rules without a selector are output to the front-end. Props isabel_brison. Fixes #58462. Built from https://develop.svn.wordpress.org/trunk@55912 git-svn-id: http://core.svn.wordpress.org/trunk@55424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
5be9311067
commit
86bad3cdf6
@ -589,8 +589,15 @@ class WP_Theme_JSON {
|
|||||||
$this->theme_json = WP_Theme_JSON_Schema::migrate( $theme_json );
|
$this->theme_json = WP_Theme_JSON_Schema::migrate( $theme_json );
|
||||||
$valid_block_names = array_keys( static::get_blocks_metadata() );
|
$valid_block_names = array_keys( static::get_blocks_metadata() );
|
||||||
$valid_element_names = array_keys( static::ELEMENTS );
|
$valid_element_names = array_keys( static::ELEMENTS );
|
||||||
$theme_json = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
|
$valid_variations = array();
|
||||||
$this->theme_json = static::maybe_opt_in_into_settings( $theme_json );
|
foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
|
||||||
|
if ( ! isset( $block_meta['styleVariations'] ) ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
|
||||||
|
}
|
||||||
|
$theme_json = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
|
||||||
|
$this->theme_json = static::maybe_opt_in_into_settings( $theme_json );
|
||||||
|
|
||||||
// Internally, presets are keyed by origin.
|
// Internally, presets are keyed by origin.
|
||||||
$nodes = static::get_setting_nodes( $this->theme_json );
|
$nodes = static::get_setting_nodes( $this->theme_json );
|
||||||
@ -668,9 +675,10 @@ class WP_Theme_JSON {
|
|||||||
* @param array $input Structure to sanitize.
|
* @param array $input Structure to sanitize.
|
||||||
* @param array $valid_block_names List of valid block names.
|
* @param array $valid_block_names List of valid block names.
|
||||||
* @param array $valid_element_names List of valid element names.
|
* @param array $valid_element_names List of valid element names.
|
||||||
|
* @param array $valid_variations List of valid variations per block.
|
||||||
* @return array The sanitized output.
|
* @return array The sanitized output.
|
||||||
*/
|
*/
|
||||||
protected static function sanitize( $input, $valid_block_names, $valid_element_names ) {
|
protected static function sanitize( $input, $valid_block_names, $valid_element_names, $valid_variations ) {
|
||||||
|
|
||||||
$output = array();
|
$output = array();
|
||||||
|
|
||||||
@ -728,9 +736,13 @@ class WP_Theme_JSON {
|
|||||||
$style_variation_names = array();
|
$style_variation_names = array();
|
||||||
if (
|
if (
|
||||||
! empty( $input['styles']['blocks'][ $block ]['variations'] ) &&
|
! empty( $input['styles']['blocks'][ $block ]['variations'] ) &&
|
||||||
is_array( $input['styles']['blocks'][ $block ]['variations'] )
|
is_array( $input['styles']['blocks'][ $block ]['variations'] ) &&
|
||||||
|
isset( $valid_variations[ $block ] )
|
||||||
) {
|
) {
|
||||||
$style_variation_names = array_keys( $input['styles']['blocks'][ $block ]['variations'] );
|
$style_variation_names = array_intersect(
|
||||||
|
array_keys( $input['styles']['blocks'][ $block ]['variations'] ),
|
||||||
|
$valid_variations[ $block ]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$schema_styles_variations = array();
|
$schema_styles_variations = array();
|
||||||
@ -2852,8 +2864,15 @@ class WP_Theme_JSON {
|
|||||||
|
|
||||||
$valid_block_names = array_keys( static::get_blocks_metadata() );
|
$valid_block_names = array_keys( static::get_blocks_metadata() );
|
||||||
$valid_element_names = array_keys( static::ELEMENTS );
|
$valid_element_names = array_keys( static::ELEMENTS );
|
||||||
|
$valid_variations = array();
|
||||||
|
foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
|
||||||
|
if ( ! isset( $block_meta['styleVariations'] ) ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
|
||||||
|
}
|
||||||
|
|
||||||
$theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names );
|
$theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names, $valid_variations );
|
||||||
|
|
||||||
$blocks_metadata = static::get_blocks_metadata();
|
$blocks_metadata = static::get_blocks_metadata();
|
||||||
$style_nodes = static::get_style_nodes( $theme_json, $blocks_metadata );
|
$style_nodes = static::get_style_nodes( $theme_json, $blocks_metadata );
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '6.3-alpha-55911';
|
$wp_version = '6.3-alpha-55912';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
Loading…
Reference in New Issue
Block a user