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

Timestamp:

03/12/2024 02:06:51 PM (15 months ago)

Author:

youknowriad

Message:

Editor: Update Packages with the latest bug fixes for 6.5 RC 2

It includes all the backports from this Gutenberg PR ​https://github.com/WordPress/gutenberg/pull/59756/

Props get_dave, swissspidy, bernhard-reiter, youknowriad.
See #60315.

File:

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

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

@@ -544 +544 @@
      * Gets the nav element directives.
      *
-     * @param bool  $is_interactive Whether the block is interactive.
-     * @param array $attributes     The block attributes.
+     * @param bool $is_interactive Whether the block is interactive.
      * @return string the directives for the navigation element.
      */
@@ -1459 +1458 @@
  * Updates the post meta with the list of ignored hooked blocks when the navigation is created or updated via the REST API.
  *
- * @param WP_Post $post Post object.
+ * @access private
+ * @since 6.5.0
+ *
+ * @param stdClass $post Post object.
+ * @return stdClass The updated post object.
  */
 function block_core_navigation_update_ignore_hooked_blocks_meta( $post ) {
-    // We run the Block Hooks mechanism to inject the `metadata.ignoredHookedBlocks` attribute into
-    // all anchor blocks. For the root level, we create a mock Navigation and extract them from there.
+    /*
+     * We run the Block Hooks mechanism to inject the `metadata.ignoredHookedBlocks` attribute into
+     * all anchor blocks. For the root level, we create a mock Navigation and extract them from there.
+     */
     $blocks = parse_blocks( $post->post_content );
-    $markup = block_core_navigation_set_ignored_hooked_blocks_metadata( $blocks, $post );
+
+    /*
+     * Block Hooks logic requires a `WP_Post` object (rather than the `stdClass` with the updates that
+     * we're getting from the `rest_pre_insert_wp_navigation` filter) as its second argument (to be
+     * used as context for hooked blocks insertion).
+     * We thus have to look it up from the DB,based on `$post->ID`.
+     */
+    $markup = block_core_navigation_set_ignored_hooked_blocks_metadata( $blocks, get_post( $post->ID ) );
 
     $root_nav_block        = parse_blocks( $markup )[0];
@@ -1481 +1493 @@
     }
 
-    $serialized_inner_blocks = block_core_navigation_remove_serialized_parent_block( $markup );
-
-    wp_update_post(
-        array(
-            'ID'           => $post->ID,
-            'post_content' => $serialized_inner_blocks,
-        )
-    );
-}
-
-// Before adding our filter, we verify if it's already added in Core.
-// However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
-// Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
-$rest_insert_wp_navigation_core_callback = 'block_core_navigation_' . 'update_ignore_hooked_blocks_meta';
-
-// 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( 'set_ignored_hooked_blocks_metadata' ) && ! has_filter( 'rest_insert_wp_navigation', $rest_insert_wp_navigation_core_callback ) ) {
-    add_action( 'rest_insert_wp_navigation', 'block_core_navigation_update_ignore_hooked_blocks_meta', 10, 3 );
+    $post->post_content = block_core_navigation_remove_serialized_parent_block( $markup );
+    return $post;
+}
+
+/*
+ * Before adding our filter, we verify if it's already added in Core.
+ * However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
+ * Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
+ */
+$rest_insert_wp_navigation_core_callback = 'block_core_navigation_' . 'update_ignore_hooked_blocks_meta'; // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+
+/*
+ * 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( 'set_ignored_hooked_blocks_metadata' ) && ! has_filter( 'rest_pre_insert_wp_navigation', $rest_insert_wp_navigation_core_callback ) ) {
+    add_filter( 'rest_pre_insert_wp_navigation', 'block_core_navigation_update_ignore_hooked_blocks_meta' );
+}
+
+/*
+ * Previous versions of Gutenberg were attaching the block_core_navigation_update_ignore_hooked_blocks_meta
+ * function to the `rest_insert_wp_navigation` _action_ (rather than the `rest_pre_insert_wp_navigation` _filter_).
+ * To avoid collisions, we need to remove the filter from that action if it's present.
+ */
+if ( has_filter( 'rest_insert_wp_navigation', $rest_insert_wp_navigation_core_callback ) ) {
+    remove_filter( 'rest_insert_wp_navigation', $rest_insert_wp_navigation_core_callback );
 }
 
@@ -1507 +1526 @@
  * @param WP_REST_Response $response The response object.
  * @param WP_Post          $post     Post object.
- * @param WP_REST_Request  $request  Request object.
  * @return WP_REST_Response The response object.
  */
@@ -1526 +1544 @@
 }
 
-// Before adding our filter, we verify if it's already added in Core.
-// However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
-// Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
+/*
+ *  Before adding our filter, we verify if it's already added in Core.
+ * However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
+ * Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
+ */
 $rest_prepare_wp_navigation_core_callback = 'block_core_navigation_' . 'insert_hooked_blocks_into_rest_response';
 
-// 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.
+/*
+ * 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( 'set_ignored_hooked_blocks_metadata' ) && ! has_filter( 'rest_prepare_wp_navigation', $rest_prepare_wp_navigation_core_callback ) ) {
     add_filter( 'rest_prepare_wp_navigation', 'block_core_navigation_insert_hooked_blocks_into_rest_response', 10, 3 );