Ticket #28140: 28140.diff

src/wp-includes/nav-menu.php

@@ -331 +331 @@
                 'menu-item-object-id' => 0,
                 'menu-item-object' => '',
                 'menu-item-parent-id' => 0,
-                'menu-item-position' => 0,
+                'menu-item-position' => 1,
                 'menu-item-type' => 'custom',
                 'menu-item-title' => '',
                 'menu-item-url' => '',
@@ -345 +345 @@
 
         $args = wp_parse_args( $menu_item_data, $defaults );
 
-        if ( 0 == $menu_id ) {
-                $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' ) );
+        if ( 0 != $menu_id && 0 == (int) $args['menu-item-position'] ) {
+                $menu_items = (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( $menu_items );
+                if ( $last_item && isset( $last_item->menu_order ) ) {
+                        $args['menu-item-position']     = 1 + $last_item->menu_order;
+                } elseif ( count( $menu_items ) ) {
+                        $args['menu-item-position']     = count( $menu_items );
+                }
         }
 
         $original_parent = 0 < $menu_item_db_id ? get_post_field( 'post_parent', $menu_item_db_id ) : 0;