Changeset 22235

Timestamp:

10/15/2012 02:27:16 PM (12 years ago)

Author:

nacin

Message:

Optimize wp_update_nav_menu_item() for high performance. Only query items for a menu when we need them. Update items after updating its meta so the meta cache can be leveraged. see #22189.

File:

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

trunk/wp-includes/nav-menu.php

@@ -279 +279 @@
     if ( ( ! $menu && 0 !== $menu_id ) || is_wp_error( $menu ) )
         return $menu;
-
-    $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-
-    $count = count( $menu_items );
 
     $defaults = array(
@@ -306 +302 @@
         $args['menu-item-position'] = 1;
     } elseif ( 0 == (int) $args['menu-item-position'] ) {
+        $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
         $last_item = array_pop( $menu_items );
-        $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : $count;
+        $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
     }
 
@@ -351 +348 @@
     );
 
-    if ( 0 != $menu_id )
+    if ( $menu_id && ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) )
         $post['tax_input'] = array( 'nav_menu' => array( intval( $menu->term_id ) ) );
 
+    $update = 0 != $menu_item_db_id;
+
     // New menu item. Default is draft status
-    if ( 0 == $menu_item_db_id ) {
+    if ( ! $update ) {
         $post['ID'] = 0;
         $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
         $menu_item_db_id = wp_insert_post( $post );
-
-    // Update existing menu item. Default is publish status
-    } else {
-        $post['ID'] = $menu_item_db_id;
-        $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
-        wp_update_post( $post );
+        if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) )
+            return $menu_item_db_id;
     }
 
@@ -372 +367 @@
     }
 
-    if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) )
-        return $menu_item_db_id;
-
     $menu_item_db_id = (int) $menu_item_db_id;
 
     update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']) );
-    update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', (int) $args['menu-item-parent-id'] );
-    update_post_meta( $menu_item_db_id, '_menu_item_object_id', (int) $args['menu-item-object-id'] );
+    update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', strval( (int) $args['menu-item-parent-id'] ) );
+    update_post_meta( $menu_item_db_id, '_menu_item_object_id', strval( (int) $args['menu-item-object-id'] ) );
     update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
     update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
@@ -390 +382 @@
 
     if ( 0 == $menu_id )
-        update_post_meta( $menu_item_db_id, '_menu_item_orphaned', time() );
-    else
+        update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
+    elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) )
         delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
+
+    // Update existing menu item. Default is publish status
+    if ( $update ) {
+        $post['ID'] = $menu_item_db_id;
+        $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
+        wp_update_post( $post );
+    }
 
     do_action('wp_update_nav_menu_item', $menu_id, $menu_item_db_id, $args );