Ticket #30261: 30261.3.diff

src/wp-admin/includes/upgrade.php

@@ -534 +534 @@
         // Don't harsh my mellow. upgrade_430() must be called before
         // upgrade_420() to catch bad comments prior to any auto-expansion of
         // MySQL column widths.
-        if ( $wp_current_db_version < 32364 )
+        if ( $wp_current_db_version < 32713 )
                 upgrade_430();
 
         if ( $wp_current_db_version < 31351 )
@@ -1559 +1559 @@
                         wp_delete_comment( $comment->comment_ID, true );
                 }
         }
+
+        if ( $wp_current_db_version < 32713 ) {
+                split_all_shared_terms();
+        }
 }
 
 /**
@@ -1851 +1855 @@
 }
 
 /**
+ * Split all shared taxonomy terms.
+ *
+ * @since 4.3.0
+ */
+function split_all_shared_terms() {
+        global $wpdb;
+
+        // Get a list of shared term IDs, and the term-taxonomy pairs that correspond to them.
+        $shared_terms = $wpdb->get_results(
+                "SELECT tt.term_id, t.*, count(*) as term_tt_count FROM {$wpdb->term_taxonomy} tt
+                        LEFT JOIN {$wpdb->terms} t ON t.term_id = tt.term_id
+                        GROUP BY t.term_id
+                        HAVING term_tt_count > 1"
+        );
+
+        // Rekey for faster lookups.
+        $_shared_terms = array();
+        foreach ( $shared_terms as $shared_term ) {
+                $term_id = intval( $shared_term->term_id );
+                $_shared_terms[ $term_id ] = $shared_term;
+        }
+        $shared_terms = $_shared_terms;
+
+        // Get term taxonomy data for all shared terms.
+        $shared_term_ids = implode( ',', array_keys( $shared_terms ) );
+        $shared_tts = $wpdb->get_results( "SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})" );
+
+        // Split term data recording is slow, so we do it just once, outside the loop.
+        $suspend = wp_suspend_cache_invalidation( true );
+        $split_term_data = get_option( '_split_terms', array() );
+        $skipped_first_term = $taxonomies = array();
+        foreach ( $shared_tts as $shared_tt ) {
+                $term_id = intval( $shared_tt->term_id );
+
+                // Don't split the first tt belonging to a given term_id.
+                if ( ! isset( $skipped_first_term[ $term_id ] ) ) {
+                        $skipped_first_term[ $term_id ] = 1;
+                        continue;
+                }
+
+                if ( ! isset( $split_term_data[ $term_id ] ) ) {
+                        $split_term_data[ $term_id ] = array();
+                }
+
+                // Keep track of taxonomies whose hierarchies need flushing.
+                if ( ! isset( $taxonomies[ $shared_tt->taxonomy ] ) ) {
+                        $taxonomies[ $shared_tt->taxonomy ] = 1;
+                }
+
+                $split_term_data[ $term_id ][ $shared_tt->taxonomy ] = _split_shared_term( $shared_terms[ $term_id ], $shared_tt, false );
+        }
+
+        // Rebuild the cached hierarchy for each affected taxonomy.
+        foreach ( array_keys( $taxonomies ) as $tax ) {
+                delete_option( "{$tax}_children" );
+                _get_term_hierarchy( $tax );
+        }
+
+        wp_suspend_cache_invalidation( $suspend );
+        update_option( '_split_terms', $split_term_data );
+}
+
+/**
  * Retrieve all options as it was for 1.2.
  *
  * @since 1.2.0

src/wp-includes/taxonomy.php

@@ -4191 +4191 @@
  *
  * @global wpdb $wpdb
  *
- * @param int  $term_id          ID of the shared term.
- * @param int  $term_taxonomy_id ID of the term_taxonomy item to receive a new term.
+ * @param int|object $term_id          ID of the shared term, or the shared term object.
+ * @param int|object $term_taxonomy_id ID of the term_taxonomy item to receive a new term, or the term_taxonomy object
+ *                                     (corresponding to a row from the term_taxonomy table).
+ * @param bool       $record           Whether to record data about the split term in the options table. The recording
+ *                                     process has the potential to be resource-intensive, so during batch operations
+ *                                     it can be beneficial to skip inline recording and do it just once, after the
+ *                                     batch is processed. Only set this to `false` if you know what you are doing.
+ *                                     Default: true.
  * @return int|WP_Error When the current term does not need to be split (or cannot be split on the current
  *                      database schema), `$term_id` is returned. When the term is successfully split, the
  *                      new term_id is returned. A WP_Error is returned for miscellaneous errors.
  */
-function _split_shared_term( $term_id, $term_taxonomy_id ) {
+function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
         global $wpdb;
 
+        if ( is_object( $term_id ) ) {
+                $shared_term = $term_id;
+                $term_id = intval( $shared_term->term_id );
+        }
+
+        if ( is_object( $term_taxonomy_id ) ) {
+                $term_taxonomy = $term_taxonomy_id;
+                $term_taxonomy_id = intval( $term_taxonomy->term_taxonomy_id );
+        }
+
         // Don't try to split terms if database schema does not support shared slugs.
         $current_db_version = get_option( 'db_version' );
         if ( $current_db_version < 30133 ) {
@@ -4208 +4224 @@
 
         // If there are no shared term_taxonomy rows, there's nothing to do here.
         $shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
+
         if ( ! $shared_tt_count ) {
                 return $term_id;
         }
 
         // Pull up data about the currently shared slug, which we'll use to populate the new one.
-        $shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) );
+        if ( empty( $shared_term ) ) {
+                $shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) );
+        }
 
         $new_term_data = array(
                 'name' => $shared_term->name,
@@ -4234 +4253 @@
         );
 
         // Reassign child terms to the new parent.
-        $term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
-        $children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE taxonomy = %s AND parent = %d", $term_taxonomy->taxonomy, $term_id ) );
+        if ( empty( $term_taxonomy ) ) {
+                $term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
+        }
 
+        $children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy ) );
         if ( ! empty( $children_tt_ids ) ) {
                 foreach ( $children_tt_ids as $child_tt_id ) {
                         $wpdb->update( $wpdb->term_taxonomy,
                                 array( 'parent' => $new_term_id ),
                                 array( 'term_taxonomy_id' => $child_tt_id )
                         );
+
                         clean_term_cache( $term_id, $term_taxonomy->taxonomy );
                 }
         } else {
@@ -4259 +4281 @@
         }
 
         // Keep a record of term_ids that have been split, keyed by old term_id. See {@see wp_get_split_term()}.
-        $split_term_data = get_option( '_split_terms', array() );
-        if ( ! isset( $split_term_data[ $term_id ] ) ) {
-                $split_term_data[ $term_id ] = array();
-        }
-
-        $split_term_data[ $term_id ][ $term_taxonomy->taxonomy ] = $new_term_id;
+        if ( $record ) {
+                $split_term_data = get_option( '_split_terms', array() );
+                if ( ! isset( $split_term_data[ $term_id ] ) ) {
+                        $split_term_data[ $term_id ] = array();
+                }
 
-        update_option( '_split_terms', $split_term_data );
+                $split_term_data[ $term_id ][ $term_taxonomy->taxonomy ] = $new_term_id;
+                update_option( '_split_terms', $split_term_data );
+        }
 
         /**
          * Fires after a previously shared taxonomy term is split into two separate terms.

src/wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 32453;
+$wp_db_version = 32713;
 
 /**
  * Holds the TinyMCE version