Changeset 22233

Timestamp:

10/15/2012 02:17:50 PM (12 years ago)

Author:

nacin

Message:

Prime post term caches for nav menu items. Avoid doing so in frontend template functions as it remains unneeded there. see #22189.

Location:

trunk/wp-includes

Files:

• nav-menu-template.php (modified) (2 diffs)
• nav-menu.php (modified) (1 diff)

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

@@ -156 +156 @@
         $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;
@@ -165 +165 @@
     // 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 ) );
 
     /*

trunk/wp-includes/nav-menu.php

@@ -484 +484 @@
 
     $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 )