wp-cli#5047: reorder menu items after insert and delete commands

Author: petruchek

src/Menu_Item_Command.php

@@ -369,19 +369,28 @@ public function delete( $args, $assoc_args ) {
 
 		foreach ( $args as $arg ) {
 
+			$post           = get_post($arg);
+			$menu_term      = get_the_terms($arg, 'nav_menu');
 			$parent_menu_id = (int) get_post_meta( $arg, '_menu_item_menu_item_parent', true );
 			$result         = wp_delete_post( $arg, true );
 			if ( ! $result ) {
 				WP_CLI::warning( "Couldn't delete menu item {$arg}." );
 				$errors++;
-			} elseif ( $parent_menu_id ) {
-				$children = $wpdb->get_results( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key='_menu_item_menu_item_parent' AND meta_value=%s", (int) $arg ) );
-				if ( $children ) {
-					$children_query = $wpdb->prepare( "UPDATE $wpdb->postmeta SET meta_value = %d WHERE meta_key = '_menu_item_menu_item_parent' AND meta_value=%s", $parent_menu_id, (int) $arg );
-					// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- $children_query is already prepared above.
-					$wpdb->query( $children_query );
-					foreach ( $children as $child ) {
-						clean_post_cache( $child );
+			} else {
+
+				if ( is_array($menu_term) && !empty($menu_term) && $post ) {
+					$this->reorder_menu_items( $menu_term[0]->term_id, $post->menu_order, -1, 0 );
+				}
+
+				if ( $parent_menu_id ) {
+					$children = $wpdb->get_results( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key='_menu_item_menu_item_parent' AND meta_value=%s", (int) $arg ) );
+					if ( $children ) {
+						$children_query = $wpdb->prepare( "UPDATE $wpdb->postmeta SET meta_value = %d WHERE meta_key = '_menu_item_menu_item_parent' AND meta_value=%s", $parent_menu_id, (int) $arg );
+						// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- $children_query is already prepared above.
+						$wpdb->query( $children_query );
+						foreach ( $children as $child ) {
+							clean_post_cache( $child );
+						}
 					}
 				}
 			}
@@ -477,6 +486,10 @@ private function add_or_update_item( $method, $type, $args, $assoc_args ) {
 			}
 		} else {
 
+			if ( 'add' === $method ) {
+				$this->reorder_menu_items( $menu->term_id, $menu_item_args['menu-item-position'], +1, $result );
+			}
+
 			/**
 			 * Set the menu
 			 *
@@ -503,6 +516,23 @@ private function add_or_update_item( $method, $type, $args, $assoc_args ) {
 
 	}
 
+	/**
+	 * Move block of items in one nav_menu up or down by incrementing/decrementing their menu_order field.
+	 * Expects the menu items to have proper menu_orders (i.e. doesn't fix errors from previous incorrect operations).
+	 *
+	 * @param int $menu_id ID of the nav_menu
+	 * @param int $min_position minimal menu_order to touch
+	 * @param int $increment how much to change menu_order: +1 to move down, -1 to move up
+	 * @param int $ignore_item_id menu item that should be ignored by the change (e.g. newly created menu item)
+	 * @return int number of rows affected
+	 */
+	private function reorder_menu_items( $menu_id, $min_position, $increment, $ignore_item_id = 0 )
+	{
+		global $wpdb;
+		$reorder_query = $wpdb->prepare( "UPDATE $wpdb->posts SET `menu_order`=`menu_order`+(%d) WHERE `menu_order`>=%d AND ID IN (SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id=%d) AND ID<>%d", (int) $increment, (int) $min_position, (int) $menu_id, (int) $ignore_item_id );
+		return $wpdb->query( $reorder_query );
+	}
+
 	protected function get_formatter( &$assoc_args ) {
 		return new Formatter( $assoc_args, $this->obj_fields );
 	}