Changeset 32294

Timestamp:

04/24/2015 06:57:07 PM (11 years ago)

Author:

boonebgorges

Message:

When priming the cache for taxonomy term nav items, don't fetch term descendants.

Descending the term tree causes unnecessary database queries when priming the
cache for a term with many descendants.

Fixes #31724.

Location:

trunk

Files:

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

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

@@ -586 +586 @@
                 if ( ! empty( $terms ) ) {
                         foreach ( array_keys($terms) as $taxonomy ) {
-                                get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
+                                get_terms( $taxonomy, array(
+                                        'include' => $terms[ $taxonomy ],
+                                        'hierarchical' => false,
+                                ) );
                         }
                 }

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

@@ -118 +118 @@
         }
 
+        public function test_wp_get_nav_menu_items_with_taxonomy_term() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $child_terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax', 'parent' => $t ) );
+
+                $term_menu_item = wp_update_nav_menu_item( $this->menu_id, 0, array(
+                        'menu-item-type' => 'taxonomy',
+                        'menu-item-object' => 'wptests_tax',
+                        'menu-item-object-id' => $t,
+                        'menu-item-status' => 'publish'
+                ) );
+
+                $term = get_term( $t, 'wptests_tax' );
+
+                $menu_items = wp_get_nav_menu_items( $this->menu_id );
+                $this->assertSame( $term->name, $menu_items[0]->title );
+                $this->assertEquals( $t, $menu_items[0]->object_id );
+        }
+
         /**
          * @ticket 29460