Changeset 53504 for trunk/src/wp-includes/nav-menu.php

Timestamp:

06/15/2022 10:18:02 AM (3 years ago)

Author:

spacedmonkey

Message:

REST API: Prime caches for linked objects in menu item REST API controller.

Add a new parameter to WP_Query called update_menu_item_cache that when set to true, primes the caches for linked terms and posts for menu item post objects. This change moves logic
found in wp_get_nav_menu_items into a new function called update_menu_item_cache. Update the menu item REST API controller, to pass the update_menu_item_cache parameter to the
arguments used for the WP_Query run to get menu items.

Props furi3r, TimothyBlynJacobs, spacedmonkey, peterwilsoncc, mitogh.
Fixes #55620.

--This line, and those below, will be ignored--

M src/wp-includes/class-wp-query.php
M src/wp-includes/nav-menu.php
M src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php
M tests/phpunit/tests/post/nav-menu.php

File:

• trunk/src/wp-includes/nav-menu.php (modified) (4 diffs)

trunk/src/wp-includes/nav-menu.php

@@ -692 +692 @@
     }
 
-    static $fetched = array();
-
     if ( ! taxonomy_exists( 'nav_menu' ) ) {
         return false;
@@ -699 +697 @@
 
     $defaults = array(
-        'order'       => 'ASC',
-        'orderby'     => 'menu_order',
-        'post_type'   => 'nav_menu_item',
-        'post_status' => 'publish',
-        'output'      => ARRAY_A,
-        'output_key'  => 'menu_order',
-        'nopaging'    => true,
-        'tax_query'   => array(
+        'order'                  => 'ASC',
+        'orderby'                => 'menu_order',
+        'post_type'              => 'nav_menu_item',
+        'post_status'            => 'publish',
+        'output'                 => ARRAY_A,
+        'output_key'             => 'menu_order',
+        'nopaging'               => true,
+        'update_menu_item_cache' => true,
+        'tax_query'              => array(
             array(
                 'taxonomy' => 'nav_menu',
@@ -721 +720 @@
     }
 
-    // Prime posts and terms caches.
-    if ( empty( $fetched[ $menu->term_id ] ) ) {
-        $fetched[ $menu->term_id ] = true;
-        $post_ids                  = array();
-        $term_ids                  = array();
-        foreach ( $items as $item ) {
-            $object_id = get_post_meta( $item->ID, '_menu_item_object_id', true );
-            $type      = get_post_meta( $item->ID, '_menu_item_type', true );
-
-            if ( 'post_type' === $type ) {
-                $post_ids[] = (int) $object_id;
-            } elseif ( 'taxonomy' === $type ) {
-                $term_ids[] = (int) $object_id;
-            }
-        }
-
-        if ( ! empty( $post_ids ) ) {
-            _prime_post_caches( $post_ids, false );
-        }
-        unset( $post_ids );
-
-        if ( ! empty( $term_ids ) ) {
-            _prime_term_caches( $term_ids );
-        }
-        unset( $term_ids );
-    }
-
     $items = array_map( 'wp_setup_nav_menu_item', $items );
 
@@ -779 +751 @@
      */
     return apply_filters( 'wp_get_nav_menu_items', $items, $menu, $args );
+}
+
+/**
+ * Prime all linked objects to menu items.
+ *
+ * @since 6.1.0
+ *
+ * @param WP_Post[] $menu_items Array post objects of menu items.
+ */
+function update_menu_item_cache( $menu_items ) {
+    $post_ids = array();
+    $term_ids = array();
+
+    foreach ( $menu_items as $menu_item ) {
+        if ( 'nav_menu_item' !== $menu_item->post_type ) {
+            continue;
+        }
+        $object_id = get_post_meta( $menu_item->ID, '_menu_item_object_id', true );
+        $type      = get_post_meta( $menu_item->ID, '_menu_item_type', true );
+
+        if ( 'post_type' === $type ) {
+            $post_ids[] = (int) $object_id;
+        } elseif ( 'taxonomy' === $type ) {
+            $term_ids[] = (int) $object_id;
+        }
+    }
+
+    if ( ! empty( $post_ids ) ) {
+        _prime_post_caches( $post_ids, false );
+    }
+
+    if ( ! empty( $term_ids ) ) {
+        _prime_term_caches( $term_ids );
+    }
 }