Ticket #29728: wp_delete_nav_menu_item.patch

wp-admin/includes/nav-menu.php

@@ -1237 +1237 @@
         $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
         foreach( (array) $menu_items_to_delete as $menu_item_id )
-                wp_delete_post( $menu_item_id, true );
+                wp_delete_nav_menu_item( $menu_item_id );
 }
 add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
@@ -1291 +1291 @@
         if ( ! empty( $menu_items ) ) {
                 foreach ( array_keys( $menu_items ) as $menu_item_id ) {
                         if ( is_nav_menu_item( $menu_item_id ) ) {
-                                wp_delete_post( $menu_item_id );
+                                wp_delete_nav_menu_item( $menu_item_id );
                         }
                 }
         }

wp-admin/nav-menus.php

@@ -230 +230 @@
 
                 check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
-                if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
+                if ( wp_delete_nav_menu_item( $menu_item_id ) )
                         $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
                 break;
 

wp-includes/nav-menu.php

@@ -187 +187 @@
         $menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
         if ( ! empty( $menu_objects ) ) {
                 foreach ( $menu_objects as $item ) {
-                        wp_delete_post( $item );
+                        wp_delete_nav_menu_item( $item );
                 }
         }
 
@@ -453 +453 @@
 }
 
 /**
+ * Delete a menu item.
+ *
+ * @param int $menu_item_id The ID of the menu item. Required.
+ * @return bool $result         True if deletion was successful, false otherwise.
+ */
+function wp_delete_nav_menu_item( $menu_item_id ) {
+    $result = is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true );
+    return $result;
+}
+
+/**
  * Returns all navigation menu objects.
  *
  * @since 3.0.0
@@ -834 +845 @@
         $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'post_type' );
 
         foreach( (array) $menu_item_ids as $menu_item_id ) {
-                wp_delete_post( $menu_item_id, true );
+                wp_delete_nav_menu_item( $menu_item_id );
         }
 }
 
@@ -853 +864 @@
         $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
 
         foreach( (array) $menu_item_ids as $menu_item_id ) {
-                wp_delete_post( $menu_item_id, true );
+                wp_delete_nav_menu_item( $menu_item_id );
         }
 }