From 1282aadbab6097ef7a95994863059fa108688c73 Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Thu, 26 Sep 2024 16:07:11 +0500 Subject: [PATCH 1/2] Navigation block: Use apply-block-hooks-to-content --- packages/block-library/src/navigation/index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index 10fec84ed59d9c..8124f544e62c6a 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -1499,6 +1499,12 @@ function block_core_navigation_mock_parsed_block( $inner_blocks, $post ) { */ function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) { $mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post ); + + if ( function_exists( 'apply_block_hooks_to_content' ) ) { + $mock_navigation_block_markup = serialize_block( $mock_navigation_block ); + return apply_block_hooks_to_content( $mock_navigation_block_markup, $post, 'insert_hooked_blocks' ); + } + $hooked_blocks = get_hooked_blocks(); $before_block_visitor = null; $after_block_visitor = null; From 2884bffb7092beed64a1d10f270efcecb48a5533 Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Fri, 27 Sep 2024 16:01:43 +0500 Subject: [PATCH 2/2] WPCS --- packages/block-library/src/navigation/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index 8124f544e62c6a..fa9bb5a56f8012 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -1505,9 +1505,9 @@ function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) { return apply_block_hooks_to_content( $mock_navigation_block_markup, $post, 'insert_hooked_blocks' ); } - $hooked_blocks = get_hooked_blocks(); - $before_block_visitor = null; - $after_block_visitor = null; + $hooked_blocks = get_hooked_blocks(); + $before_block_visitor = null; + $after_block_visitor = null; if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) { $before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );