Changeset 57499 for trunk/src/wp-includes/blocks/navigation.php

Timestamp:

01/31/2024 11:54:09 AM (3 years ago)

Author:

youknowriad

Message:

Editor: Update WordPress packages to Gutenberg 16.7 RC3.

It brings with a set of iterations and follow-ups to the initial package update.
It also fixes a regression that happened for interactive blocks.

Props gziolo, luisherranz, cbravobernal.
See #60315.

File:

• trunk/src/wp-includes/blocks/navigation.php (modified) (6 diffs)

trunk/src/wp-includes/blocks/navigation.php

@@ -193 +193 @@
                         $blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
 
-                        if ( function_exists( 'get_hooked_blocks' ) ) {
+                        if ( function_exists( 'get_hooked_block_markup' ) ) {
                                 // Run Block Hooks algorithm to inject hooked blocks.
                                 $markup         = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
@@ -993 +993 @@
                 $fallback_blocks = ! empty( $maybe_fallback ) ? $maybe_fallback : $fallback_blocks;
 
-                if ( function_exists( 'get_hooked_blocks' ) ) {
+                if ( function_exists( 'get_hooked_block_markup' ) ) {
                         // Run Block Hooks algorithm to inject hooked blocks.
                         // We have to run it here because we need the post ID of the Navigation block to track ignored hooked blocks.
@@ -1359 +1359 @@
  * @return string Serialized inner blocks in mock Navigation block wrapper, with hooked blocks inserted, if any.
  */
-function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post = null ) {
+function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) {
         $before_block_visitor = null;
         $after_block_visitor  = null;
@@ -1398 +1398 @@
  */
 function block_core_navigation_update_ignore_hooked_blocks_meta( $post ) {
-        if ( ! isset( $post->ID ) ) {
-                return;
-        }
-
         // We run the Block Hooks mechanism so it will return the list of ignored hooked blocks
         // in the mock root Navigation block's metadata attribute.
@@ -1423 +1419 @@
 }
 
-// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.4
-// that are not present in Gutenberg's WP 6.4 compatibility layer.
-if ( function_exists( 'get_hooked_blocks' ) ) {
+// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.5
+// that are not present in Gutenberg's WP 6.5 compatibility layer.
+if ( function_exists( 'get_hooked_block_markup' ) ) {
         add_action( 'rest_insert_wp_navigation', 'block_core_navigation_update_ignore_hooked_blocks_meta', 10, 3 );
 }
@@ -1455 +1451 @@
 }
 
-// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.4
-// that are not present in Gutenberg's WP 6.4 compatibility layer.
-if ( function_exists( 'get_hooked_blocks' ) ) {
+// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.5
+// that are not present in Gutenberg's WP 6.5 compatibility layer.
+if ( function_exists( 'get_hooked_block_markup' ) ) {
         add_filter( 'rest_prepare_wp_navigation', 'block_core_navigation_insert_hooked_blocks_into_rest_response', 10, 3 );
 }