Changeset 54973

Timestamp:

12/14/2022 10:52:11 PM (21 months ago)

Author:

azaozz

Message:

Menus: Reset menu_item_parent to 0 when the parent is set to the item itself.

Props: peterwilsoncc, SergeyBiryukov, azaozz.
Fixes #57169.

Location:

trunk/src

Files:

• wp-admin/nav-menus.php (modified) (4 diffs)
• wp-includes/nav-menu-template.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (2 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -118 +118 @@
                             $parent_data                        = (array) $parent_object;
                             $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
+
+                            // Reset invalid `menu_item_parent`.
+                            $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
                             update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
                         }
@@ -127 +131 @@
 
                         $menu_item_data['menu_item_parent'] = $next_item_data['ID'];
+
+                        // Reset invalid `menu_item_parent`.
+                        $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
                         update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 
@@ -138 +146 @@
                 ) {
                     $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
+
+                    // Reset invalid `menu_item_parent`.
+                    $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
                     update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
                 }
@@ -248 +260 @@
                         // Just make it a child of the previous; keep the order.
                         $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ];
+
+                        // Reset invalid `menu_item_parent`.
+                        $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
                         update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
                         wp_update_post( $menu_item_data );

trunk/src/wp-includes/nav-menu-template.php

@@ -200 +200 @@
     $menu_items_with_children = array();
     foreach ( (array) $menu_items as $menu_item ) {
+        // Fix invalid `menu_item_parent`. See: https://core.trac.wordpress.org/ticket/56926.
+        if ( (int) $menu_item->ID === (int) $menu_item->menu_item_parent ) {
+            $menu_item->menu_item_parent = 0;
+        }
+
         $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
         $menu_items_tree[ $menu_item->ID ]           = $menu_item->menu_item_parent;

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

@@ -563 +563 @@
 
     $menu_item_db_id = (int) $menu_item_db_id;
+
+    // Reset invalid `menu_item_parent`.
+    if ( (int) $args['menu-item-parent-id'] === $menu_item_db_id ) {
+        $args['menu-item-parent-id'] = 0;
+    }
 
     update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key( $args['menu-item-type'] ) );
@@ -1274 +1279 @@
     return $new_nav_menu_locations;
 }
+
+/**
+ * Prevents menu items from being their own parent.
+ *
+ * Resets menu_item_parent to 0 when the parent is set to the item itself.
+ * For use before saving `_menu_item_menu_item_parent` in nav-menus.php.
+ *
+ * @since 6.1.2
+ * @access private
+ *
+ * @param array $menu_item_data The menu item data array.
+ * @return array The menu item data with reset menu_item_parent.
+ */
+function _wp_reset_invalid_menu_item_parent( $menu_item_data ) {
+    if ( ! is_array( $menu_item_data ) ) {
+        return $menu_item_data;
+    }
+
+    if (
+        ! empty( $menu_item_data['ID'] ) &&
+        ! empty( $menu_item_data['menu_item_parent'] ) &&
+        (int) $menu_item_data['ID'] === (int) $menu_item_data['menu_item_parent']
+    ) {
+        $menu_item_data['menu_item_parent'] = 0;
+    }
+
+    return $menu_item_data;
+}