Ticket #18271: 18271.diff

src/wp-admin/includes/nav-menu.php

@@ -293 +293 @@
                 $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
                 $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
 
+                if ( ! empty( $item->post_parent ) ) {
+                        $parent_object_id = $item->post_parent;
+                } else if ( ! empty( $item->parent ) ) {
+                        $parent_object_id = $item->parent;
+                } else {
+                        $parent_object_id = 0;
+                }
+
                 $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
 
                 $output .= $indent . '<li>';
@@ -320 +328 @@
                 $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
                 $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
                 $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
+                $output .= '<input type="hidden" class="menu-item-parent-object-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-object-id]" value="'. esc_attr( $parent_object_id ) .'" />';
                 $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
                 $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
                 $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
@@ -1047 +1056 @@
         $items_saved = array();
 
         if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+                $menu_data_values = array_values( $menu_data );
 
                 // Loop through all the menu items' POST values.
                 foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
@@ -1078 +1088 @@
                                 $_actual_db_id = (int) $_item_object_data['menu-item-db-id'];
                         }
 
+                        if ( empty( $_item_object_data['menu-item-parent-id'] ) && ! empty( $_item_object_data['menu-item-parent-object-id'] ) ) {
+                                for( $saved_id = 0; $saved_id < count( $items_saved ); $saved_id++ ) {
+                                        if (
+                                                $_item_object_data['menu-item-type'] === $menu_data_values[ $saved_id ]['menu-item-type'] && 
+                                                $_item_object_data['menu-item-object'] === $menu_data_values[ $saved_id ]['menu-item-object'] && 
+                                                $_item_object_data['menu-item-parent-object-id'] === $menu_data_values[ $saved_id ]['menu-item-object-id']
+                                        ) {
+                                                $_item_object_data['menu-item-parent-id'] = $items_saved[ $saved_id ];
+                                        }
+                                }
+                        }
+
                         $args = array(
                                 'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
                                 'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),

src/wp-admin/js/nav-menu.js

@@ -207 +207 @@
                                                 'menu-item-object-id',
                                                 'menu-item-object',
                                                 'menu-item-parent-id',
+                                                'menu-item-parent-object-id',
                                                 'menu-item-position',
                                                 'menu-item-type',
                                                 'menu-item-title',