Ticket #22189: 22189.term-cache.diff

wp-includes/nav-menu-template.php

@@ -155 +155 @@
         if ( ! $menu && !$args->theme_location ) {
                 $menus = wp_get_nav_menus();
                 foreach ( $menus as $menu_maybe ) {
-                        if ( $menu_items = wp_get_nav_menu_items($menu_maybe->term_id) ) {
+                        if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) {
                                 $menu = $menu_maybe;
                                 break;
                         }
@@ -164 +164 @@
 
         // If the menu exists, get its items.
         if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
-                $menu_items = wp_get_nav_menu_items( $menu->term_id );
+                $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
 
         /*
          * If no menu was found:

wp-includes/nav-menu.php

@@ -483 +483 @@
                 return $items;
 
         $defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item',
-                'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true,
-                'update_post_term_cache' => false );
+                'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true );
         $args = wp_parse_args( $args, $defaults );
         if ( count( $items ) > 1 )
                 $args['include'] = implode( ',', $items );