Ticket #33187: 33187.2.diff

src/wp-admin/nav-menus.php

@@ -342 +342 @@
                         }
 
                         if ( ! is_wp_error( $_menu_object ) ) {
                                 $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
                                 if ( is_wp_error( $_nav_menu_selected_id ) ) {
                                         $_menu_object = $_nav_menu_selected_id;
                                         $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                                 } else {
                                         $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                         $nav_menu_selected_title = $_menu_object->name;
                                 }
                         }
 
                         // Update menu items.
                         if ( ! is_wp_error( $_menu_object ) ) {
-                                $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
+                                $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+
+                                // If the menu ID changed, redirect to the new URL, this will loose all $messages
+                                if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
+                                        wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+                                        exit();
+                                }
                         }
                 }
                 break;
         case 'locations':
                 if ( ! $num_locations ) {
                         wp_redirect( admin_url( 'nav-menus.php' ) );
                         exit();
                 }
 
                 add_filter( 'screen_options_show_screen', '__return_false' );
 
                 if ( isset( $_POST['menu-locations'] ) ) {
                         check_admin_referer( 'save-menu-locations' );
 
                         $new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );

src/wp-includes/default-filters.php

@@ -318 +318 @@
 
 // Check if the user is logged out
 add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
 add_filter( 'heartbeat_send',        'wp_auth_check' );
 add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );
 
 // Default authentication filters
 add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
 add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
 add_filter( 'determine_current_user', 'wp_validate_auth_cookie'          );
 add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
 
 // Split term updates.
 add_action( 'split_shared_term', '_wp_check_split_default_terms',  10, 4 );
 add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 );
+add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
 
 /**
  * Filters formerly mixed into wp-includes
  */
 // Theme
 add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
 add_action( 'plugins_loaded', '_wp_customize_include' );
 add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
 add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
 
 // Calendar widget cache
 add_action( 'save_post', 'delete_get_calendar_cache' );
 add_action( 'delete_post', 'delete_get_calendar_cache' );
 add_action( 'update_option_start_of_week', 'delete_get_calendar_cache' );
 add_action( 'update_option_gmt_offset', 'delete_get_calendar_cache' );

src/wp-includes/nav-menu.php

@@ -299 +299 @@
                  *
                  * @param int   $term_id   ID of the new menu.
                  * @param array $menu_data An array of menu data.
                  */
                 do_action( 'wp_create_nav_menu', $_menu['term_id'], $menu_data );
 
                 return (int) $_menu['term_id'];
         }
 
         if ( ! $_menu || ! isset( $_menu->term_id ) )
                 return 0;
 
         $menu_id = (int) $_menu->term_id;
 
         $update_response = wp_update_term( $menu_id, 'nav_menu', $args );
+        $menu_id = (int) $update_response['term_id'];
 
         if ( is_wp_error( $update_response ) )
                 return $update_response;
 
         /**
          * Fires after a navigation menu has been successfully updated.
          *
          * @since 3.0.0
          *
          * @param int   $menu_id   ID of the updated menu.
          * @param array $menu_data An array of menu data.
          */
         do_action( 'wp_update_nav_menu', $menu_id, $menu_data );
         return $menu_id;
 }

src/wp-includes/taxonomy.php

@@ -4384 +4384 @@
                 WHERE ( m1.meta_key = '_menu_item_type' AND m1.meta_value = 'taxonomy' )
                         AND ( m2.meta_key = '_menu_item_object' AND m2.meta_value = '%s' )
                         AND ( m3.meta_key = '_menu_item_object_id' AND m3.meta_value = %d )",
                 $taxonomy,
                 $term_id
         ) );
 
         if ( $post_ids ) {
                 foreach ( $post_ids as $post_id ) {
                         update_post_meta( $post_id, '_menu_item_object_id', $new_term_id, $term_id );
                 }
         }
 }
 
 /**
+ * If the term being split is a nav_menu, change associations.
+ *
+ * @ignore
+ * @since 4.3.0
+ *
+ * @global wpdb $wpdb
+ *
+ * @param int    $term_id          ID of the formerly shared term.
+ * @param int    $new_term_id      ID of the new term created for the $term_taxonomy_id.
+ * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
+ * @param string $taxonomy         Taxonomy for the split term.
+ */
+function _wp_check_split_nav_menu_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
+        if ( 'nav_menu' !== $taxonomy ) {
+                return;
+        }
+
+        // Update menu locations.
+        $locations = get_nav_menu_locations();
+        foreach ( $locations as $location => $menu_id ) {
+                if ( $term_id == $menu_id ) {
+                        $locations[ $location ] = $new_term_id;
+                }
+        }
+        set_theme_mod( 'nav_menu_locations', $locations );
+}
+
+/**
  * Get data about terms that previously shared a single term_id, but have since been split.
  *
  * @since 4.2.0
  *
  * @param int $old_term_id Term ID. This is the old, pre-split term ID.
  * @return array Array of new term IDs, keyed by taxonomy.
  */
 function wp_get_split_terms( $old_term_id ) {
         $split_terms = get_option( '_split_terms', array() );
 
         $terms = array();
         if ( isset( $split_terms[ $old_term_id ] ) ) {
                 $terms = $split_terms[ $old_term_id ];
         }
 

tests/phpunit/tests/term/splitSharedTerm.php

@@ -183 +183 @@
 
                 $menu_id = wp_create_nav_menu( rand_str() );
                 $cat_menu_item = wp_update_nav_menu_item( $menu_id, 0, array(
                         'menu-item-type' => 'taxonomy',
                         'menu-item-object' => 'category',
                         'menu-item-object-id' => $t1['term_id'],
                         'menu-item-status' => 'publish'
                 ) );
                 $this->assertEquals( $t1['term_id'], get_post_meta( $cat_menu_item, '_menu_item_object_id', true ) );
 
                 $new_term_id = _split_shared_term( $t1['term_id'], $t1['term_taxonomy_id'] );
                 $this->assertNotEquals( $new_term_id, $t1['term_id'] );
                 $this->assertEquals( $new_term_id, get_post_meta( $cat_menu_item, '_menu_item_object_id', true ) );
         }
 
+        /**
+         * @ticket 33187
+         * @group navmenus
+         */
+        public function test_nav_menu_locations_should_be_updated_on_split() {
+                global $wpdb;
+
+                $cat_term = wp_insert_term( 'Foo Menu', 'category' );
+                $shared_term_id = $cat_term['term_id'];
+
+                $nav_term_id = wp_create_nav_menu( 'Foo Menu' );
+                $nav_term = get_term( $nav_term_id, 'nav_menu' );
+
+                // Manually modify because shared terms shouldn't naturally occur.
+                $wpdb->update( $wpdb->term_taxonomy,
+                        array( 'term_id' => $shared_term_id ),
+                        array( 'term_taxonomy_id' => $nav_term->term_taxonomy_id )
+                );
+
+                set_theme_mod( 'nav_menu_locations', array( 'foo' => $shared_term_id ) );
+
+                // Splitsville.
+                $new_term_id = _split_shared_term( $shared_term_id, $nav_term->term_taxonomy_id );
+
+                $locations = get_nav_menu_locations();
+                $this->assertEquals( $new_term_id, $locations['foo'] );
+        }
+
+        /**
+         * @ticket 33187
+         * @group navmenus
+         */
+        public function test_nav_menu_term_should_retain_menu_items_on_split() {
+                global $wpdb;
+
+                $cat_term = wp_insert_term( 'Foo Menu', 'category' );
+                $shared_term_id = $cat_term['term_id'];
+
+                $nav_term_id = wp_create_nav_menu( 'Foo Menu' );
+                $nav_term = get_term( $nav_term_id, 'nav_menu' );
+
+                // Manually modify because shared terms shouldn't naturally occur.
+                $wpdb->update( $wpdb->term_taxonomy,
+                        array( 'term_id' => $shared_term_id ),
+                        array( 'term_taxonomy_id' => $nav_term->term_taxonomy_id )
+                );
+
+                $t1 = wp_insert_term( 'Random term', 'category' );
+                $cat_menu_item = wp_update_nav_menu_item( $shared_term_id, 0, array(
+                        'menu-item-type' => 'taxonomy',
+                        'menu-item-object' => 'category',
+                        'menu-item-object-id' => $t1['term_id'],
+                        'menu-item-status' => 'publish'
+                ) );
+
+                // Updating the menu will split the shared term.
+                $new_nav_menu_id = wp_update_nav_menu_object( $shared_term_id, array(
+                        'description' => 'Updated Foo Menu',
+                        'menu-name' => 'Updated Foo Menu',
+                ) );
+
+                $menu = wp_get_nav_menu_object( $new_nav_menu_id );
+                $this->assertSame( 'Updated Foo Menu', $menu->name );
+                $this->assertSame( 'Updated Foo Menu', $menu->description );
+
+                $menu_items = wp_get_nav_menu_items( $new_nav_menu_id );
+                $this->assertEquals( array( $cat_menu_item ), wp_list_pluck( $menu_items, 'ID' ) );
+        }
+
         public function test_wp_get_split_terms() {
                 $found = wp_get_split_terms( $this->terms['t1']['term_id'] );
 
                 $expected = array(
                         'wptests_tax_2' => $this->terms['t2']['term_id'],
                         'wptests_tax_3' => $this->terms['t3']['term_id'],
                 );
 
                 $this->assertEqualSets( $expected, $found );
         }
 
         public function test_wp_get_split_term() {
                 $found = wp_get_split_term( $this->terms['t1']['term_id'], 'wptests_tax_3' );
                 $this->assertEquals( $this->terms['t3']['term_id'], $found );
         }