Changeset 54410

Timestamp:

10/07/2022 09:58:32 AM (4 years ago)

Author:

spacedmonkey

Message:

Query: Move call to update_menu_item_cache in WP_Query

Move call to update_menu_item_cache in WP_Query to after post meta caches for menu items are primed.

Props spacedmonkey, peterwilsoncc, mukesh27.
See #55620.

Location:

trunk

Files:

• src/wp-includes/class-wp-query.php (modified) (2 diffs)
• tests/phpunit/tests/post/nav-menu.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-query.php

@@ -3269 +3269 @@
                 }
 
-                if ( ! empty( $this->posts ) && $q['update_menu_item_cache'] ) {
-                        update_menu_item_cache( $this->posts );
-                }
-
                 if ( ! $q['suppress_filters'] ) {
                         /**
@@ -3467 +3463 @@
                 }
 
+                if ( ! empty( $this->posts ) && $q['update_menu_item_cache'] ) {
+                        update_menu_item_cache( $this->posts );
+                }
+
                 if ( $q['lazy_load_term_meta'] ) {
                         wp_queue_posts_for_term_meta_lazyload( $this->posts );

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -266 +266 @@
         }
 
+
+        /**
+         * @ticket 55620
+         * @covers ::update_menu_item_cache
+         */
+        public function test_wp_get_nav_menu_items_cache_primes_posts() {
+                $post_ids     = self::factory()->post->create_many( 3 );
+                $menu_nav_ids = array();
+                foreach ( $post_ids as $post_id ) {
+                        $menu_nav_ids[] = wp_update_nav_menu_item(
+                                $this->menu_id,
+                                0,
+                                array(
+                                        'menu-item-type'      => 'post_type',
+                                        'menu-item-object'    => 'post',
+                                        'menu-item-object-id' => $post_id,
+                                        'menu-item-status'    => 'publish',
+                                )
+                        );
+                }
+
+                // Delete post and post meta caches.
+                wp_cache_delete_multiple( $menu_nav_ids, 'posts' );
+                wp_cache_delete_multiple( $menu_nav_ids, 'post_meta' );
+                wp_cache_delete_multiple( $post_ids, 'posts' );
+                wp_cache_delete_multiple( $post_ids, 'post_meta' );
+
+                $action = new MockAction();
+                add_filter( 'update_post_metadata_cache', array( $action, 'filter' ), 10, 2 );
+
+                $start_num_queries = get_num_queries();
+                wp_get_nav_menu_items( $this->menu_id );
+                $queries_made = get_num_queries() - $start_num_queries;
+                $this->assertSame( 7, $queries_made, 'Only does 7 database queries when running wp_get_nav_menu_items.' );
+
+                $args = $action->get_args();
+                $this->assertSameSets( $menu_nav_ids, $args[0][1], '_prime_post_caches() was not executed.' );
+                $this->assertSameSets( $post_ids, $args[1][1], '_prime_post_caches() was not executed.' );
+        }
+
+        /**
+         * @ticket 55620
+         * @covers ::update_menu_item_cache
+         */
+        public function test_wp_get_nav_menu_items_cache_primes_terms() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $term_ids     = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $menu_nav_ids = array();
+                foreach ( $term_ids as $term_id ) {
+                        $menu_nav_ids[] = wp_update_nav_menu_item(
+                                $this->menu_id,
+                                0,
+                                array(
+                                        'menu-item-type'      => 'taxonomy',
+                                        'menu-item-object'    => 'wptests_tax',
+                                        'menu-item-object-id' => $term_id,
+                                        'menu-item-status'    => 'publish',
+                                )
+                        );
+                }
+                // Delete post and post meta caches.
+                wp_cache_delete_multiple( $menu_nav_ids, 'posts' );
+                wp_cache_delete_multiple( $menu_nav_ids, 'post_meta' );
+                // Delete term caches.
+                wp_cache_delete_multiple( $term_ids, 'terms' );
+                $action_terms = new MockAction();
+                add_filter( 'update_term_metadata_cache', array( $action_terms, 'filter' ), 10, 2 );
+
+                $action_posts = new MockAction();
+                add_filter( 'update_post_metadata_cache', array( $action_posts, 'filter' ), 10, 2 );
+
+                $start_num_queries = get_num_queries();
+                wp_get_nav_menu_items( $this->menu_id );
+                $queries_made = get_num_queries() - $start_num_queries;
+                $this->assertSame( 7, $queries_made, 'Only does 7 database queries when running wp_get_nav_menu_items.' );
+
+                $args = $action_terms->get_args();
+                $last = end( $args );
+                $this->assertSameSets( $term_ids, $last[1], '_prime_term_caches() was not executed.' );
+
+                $args = $action_posts->get_args();
+                $this->assertSameSets( $menu_nav_ids, $args[0][1], '_prime_post_caches() was not executed.' );
+        }
+
         /**
          * @ticket 13910