Changeset 14937

Timestamp:

05/26/2010 06:59:14 AM (16 years ago)

Author:

nacin

Message:

Ensure auto-added pages are both published and sent to the end of the menu. Tiny enhancement and optimization to wp_update_nav_menu_item come with it. fixes #13447.

File:

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

trunk/wp-includes/nav-menu.php

@@ -269 +269 @@
         }
 
-        $menu_items = (array) wp_get_nav_menu_items( $menu_id );
+        $menu_items = (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
 
         $count = count( $menu_items );
@@ -287 +287 @@
                 'menu-item-classes' => '',
                 'menu-item-xfn' => '',
+                'menu-item-status' => '',
         );
 
@@ -293 +294 @@
         if ( 0 == (int) $args['menu-item-position'] ) {
                 $last_item = array_pop( $menu_items );
-                if ( $last_item && isset( $last_item->ID ) ) {
-                        $last_data = get_post( $last_item->ID );
-                        if ( ! is_wp_error( $last_data ) && isset( $last_data->menu_order ) ) {
-                                $args['menu-item-position'] = 1 + (int) $last_data->menu_order;
-                        }
-
-                } else {
-                        $args['menu-item-position'] = $count;
-                }
+                $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : $count;
         }
 
@@ -351 +344 @@
         );
 
-        // New menu item
+        // New menu item. Default is draft status
         if ( 0 == $menu_item_db_id ) {
                 $post['ID'] = 0;
-                $post['post_status'] = 'draft';
+                $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
                 $menu_item_db_id = wp_insert_post( $post );
 
-        // Update existing menu item
+        // Update existing menu item. Default is publish status
         } else {
                 $post['ID'] = $menu_item_db_id;
-                $post['post_status'] = 'publish';
+                $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
                 wp_update_post( $post );
         }
@@ -763 +756 @@
                 'menu-item-object' => $post->post_type,
                 'menu-item-type' => 'post_type',
+                'menu-item-status' => 'publish',
         );
 
         foreach ( $auto_add as $menu_id ) {
-                $items = wp_get_nav_menu_items( $menu_id );
+                $items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
                 if ( ! is_array( $items ) )
                         continue;