Skip to content

Commit bb67387

Browse files
Editor: ignore unsupported duotone attribute types.
Ensure early return from duotone render if attribute is neither string nor array. Props yotatameguchi, westonruter, ramonopoly, isabel_brison. See #65817. Built from https://develop.svn.wordpress.org/trunk@64493 git-svn-id: http://core.svn.wordpress.org/trunk@63643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent 7824f9a commit bb67387

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎wp-includes/class-wp-duotone.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,12 @@ public static function render_duotone_support( $block_content, $block, $wp_block
11161116
*/
11171117

11181118
$duotone_attr = $block['attrs']['style']['color']['duotone'];
1119-
$is_preset = is_string( $duotone_attr ) && self::is_preset( $duotone_attr );
1120-
$is_css = is_string( $duotone_attr ) && ! $is_preset;
1121-
$is_custom = is_array( $duotone_attr );
1119+
if ( ! is_string( $duotone_attr ) && ! is_array( $duotone_attr ) ) {
1120+
return $block_content;
1121+
}
1122+
1123+
$is_preset = is_string( $duotone_attr ) && self::is_preset( $duotone_attr );
1124+
$is_css = is_string( $duotone_attr ) && ! $is_preset;
11221125

11231126
if ( $is_preset ) {
11241127

@@ -1136,7 +1139,7 @@ public static function render_duotone_support( $block_content, $block, $wp_block
11361139

11371140
// Just block CSS.
11381141
self::enqueue_block_css( $filter_id, $duotone_selector, $filter_value );
1139-
} elseif ( $is_custom ) {
1142+
} else {
11401143
$slug = wp_unique_id( sanitize_key( implode( '-', $duotone_attr ) . '-' ) ); // e.g. '000000-ffffff-2'.
11411144
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-000000-ffffff-2'.
11421145
$filter_value = self::get_filter_url( $filter_id ); // e.g. 'url(#wp-duotone-filter-000000-ffffff-2)'.
@@ -1148,7 +1151,7 @@ public static function render_duotone_support( $block_content, $block, $wp_block
11481151
// SVG filter and block CSS.
11491152
self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $filter_data );
11501153
}
1151-
} elseif ( $has_global_styles_duotone ) {
1154+
} else {
11521155
$slug = $global_styles_block_names[ $block['blockName'] ]; // e.g. 'blue-orange'.
11531156
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
11541157
$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.

‎wp-includes/version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.2-alpha-64492';
19+
$wp_version = '7.2-alpha-64493';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)