From fa811f9fdb2038b7aa7cc6ba7113026979158f63 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Tue, 6 Jul 2021 21:18:55 +0400 Subject: [PATCH 1/2] Duotone: Avoid rendering duplicate stylesheet and SVG --- lib/block-supports/duotone.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/block-supports/duotone.php b/lib/block-supports/duotone.php index f3b4743832f0ae..4fef915f53b4e5 100644 --- a/lib/block-supports/duotone.php +++ b/lib/block-supports/duotone.php @@ -354,11 +354,14 @@ function ( $selector ) use ( $duotone_id ) { return $content . $duotone; } -// Register the block support. -WP_Block_Supports::get_instance()->register( - 'duotone', - array( - 'register_attribute' => 'gutenberg_register_duotone_support', - ) -); -add_filter( 'render_block', 'gutenberg_render_duotone_support', 10, 2 ); +// This can be removed when plugin support requires WordPress 5.8.0+. +if ( ! function_exists( 'wp_render_duotone_support' ) ) { + // Register the block support. + WP_Block_Supports::get_instance()->register( + 'duotone', + array( + 'register_attribute' => 'gutenberg_register_duotone_support', + ) + ); + add_filter( 'render_block', 'gutenberg_render_duotone_support', 10, 2 ); +} From ce6688594df53b4528a7cdbccd3815bc702b9563 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Tue, 6 Jul 2021 22:17:34 +0400 Subject: [PATCH 2/2] Remove WordPress core filter --- lib/block-supports/duotone.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/block-supports/duotone.php b/lib/block-supports/duotone.php index 4fef915f53b4e5..fcf9191dc32775 100644 --- a/lib/block-supports/duotone.php +++ b/lib/block-supports/duotone.php @@ -354,14 +354,14 @@ function ( $selector ) use ( $duotone_id ) { return $content . $duotone; } -// This can be removed when plugin support requires WordPress 5.8.0+. -if ( ! function_exists( 'wp_render_duotone_support' ) ) { - // Register the block support. - WP_Block_Supports::get_instance()->register( - 'duotone', - array( - 'register_attribute' => 'gutenberg_register_duotone_support', - ) - ); - add_filter( 'render_block', 'gutenberg_render_duotone_support', 10, 2 ); -} +// Register the block support. +WP_Block_Supports::get_instance()->register( + 'duotone', + array( + 'register_attribute' => 'gutenberg_register_duotone_support', + ) +); + +// Remove WordPress core filter to avoid rendering duplicate support elements. +remove_filter( 'render_block', 'wp_render_duotone_support', 10, 2 ); +add_filter( 'render_block', 'gutenberg_render_duotone_support', 10, 2 );