Ticket #28140: 28140.3.patch

src/wp-includes/nav-menu.php

@@ -386 +386 @@
                 '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' => '',
@@ -400 +400 @@
 
         $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' ) );
-                $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 ( 0 != $menu_id && 1 == (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 );
+                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;

tests/phpunit/tests/post/nav-menu.php

@@ -612 +612 @@
                 $this->assertNotContains( 'current-menu-ancestor', $post_archive_menu_item->classes );
         }
 
+        /**
+         * @ticket 28140
+         */
+        public function test_position_for_first_menu_item_on_menu_should_be_one() {
+
+                $first_menu_item_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+                        'menu-item-status'    => 'publish'
+                ) );
+
+                $second_menu_item_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+                        'menu-item-status'    => 'publish'
+                ) );
+
+                $first_menu_order  = get_post_field( 'menu_order', $first_menu_item_id  );
+                $second_menu_order = get_post_field( 'menu_order', $second_menu_item_id  );
+
+                $this->assertEquals( 1, $first_menu_order );
+                $this->assertEquals( 2, $second_menu_order );
+        }
+
+        /**
+         * @ticket 28140
+         */
+        public function test_menu_order_in_wp_get_nav_menu_items_should_start_from_one() {
+
+                $first_menu_item_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+                        'menu-item-status'    => 'publish'
+                ) );
+
+                $second_menu_item_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+                        'menu-item-status'    => 'publish'
+                ) );
+
+                $menu_items = wp_get_nav_menu_items( $this->menu_id );
+        
+                $actual_menu_orders = wp_list_pluck( $menu_items, 'menu_order' );
+
+                $expected_menu_orders = array( 1, 2 );
+
+                $this->assertSame( $expected_menu_orders, $actual_menu_orders );
+        }
+
 }