Ticket #30261: 30261.6.diff

src/wp-admin/includes/admin-filters.php

@@ -100 +100 @@
 // Update hooks.
 add_action( 'admin_init', 'wp_plugin_update_rows' );
 add_action( 'admin_init', 'wp_theme_update_rows'  );
+add_action( 'admin_init', 'maybe_split_shared_terms' );
 
 add_action( 'admin_notices', 'update_nag',      3  );
 add_action( 'admin_notices', 'maintenance_nag', 10 );

src/wp-admin/includes/schema.php

@@ -496 +496 @@
 
         // 3.5
         'link_manager_enabled' => 0,
+
+        // 4.3
+        'shared_terms_split' => 0,
         );
 
         // 3.3

src/wp-admin/includes/taxonomy.php

@@ -288 +288 @@
 
         return wp_insert_term($tag_name, $taxonomy);
 }
+
+/**
+ * Initialize the shared term splitting routine, if necessary.
+ *
+ * WordPress attempts to split all shared taxonomy terms during the 4.3 update. If the update routine fails, this
+ * function will retry the split, until it succeeds.
+ *
+ * @since 4.3.0
+ */
+function maybe_split_shared_terms() {
+        if ( ! current_user_can( 'update_core' ) ) {
+                return;
+        }
+
+        // Shared terms only need to be split once.
+        if ( get_option( 'shared_terms_split' ) ) {
+                return;
+        }
+
+        split_all_shared_terms();
+}
+
+/**
+ * Splits all shared taxonomy terms.
+ *
+ * @since 4.3.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ */
+function split_all_shared_terms() {
+        global $wpdb;
+
+        // Get a list of shared terms (those with more than one associated row in term_taxonomy).
+        $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"
+        );
+
+        // No shared terms found? No need to run this script again.
+        if ( empty( $shared_terms ) ) {
+                update_option( 'shared_terms_split', 1 );
+                return;
+        }
+
+        // Rekey shared term array 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 the term.
+                $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 );
+        update_option( 'shared_terms_split', 1 );
+}

src/wp-admin/includes/upgrade.php

@@ -1506 +1506 @@
         }
 
         if ( $wp_current_db_version < 32814 ) {
-                split_all_shared_terms();
+                // Terms are split in an external process, so that all plugins are loaded.
+                $url = admin_url( 'upgrade.php?step=split_shared_terms' );
+                wp_remote_get( $url, array( 'timeout' => 5 ) );
         }
 
         if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
@@ -1686 +1688 @@
                         $tables = $wpdb->tables( 'global' );
 
                         // sitecategories may not exist.
-                        if ( ! $this->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
+                        if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
                                 unset( $tables['sitecategories'] );
                         }
 
@@ -1715 +1717 @@
                         $tables = $wpdb->tables( 'global' );
 
                         // sitecategories may not exist.
-                        if ( ! $this->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
+                        if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
                                 unset( $tables['sitecategories'] );
                         }
 
@@ -1881 +1883 @@
 }
 
 /**
- * Splits all shared taxonomy terms.
- *
- * @since 4.3.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- */
-function split_all_shared_terms() {
-        global $wpdb;
-
-        // Get a list of shared terms (those with more than one associated row in term_taxonomy).
-        $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"
-        );
-
-        if ( empty( $shared_terms ) ) {
-                return;
-        }
-
-        // Rekey shared term array 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 the term.
-                $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-admin/upgrade.php

@@ -6 +6 @@
  * @subpackage Administration
  */
 
-/**
- * We are upgrading WordPress.
- *
- * @since 1.5.1
- * @var bool
- */
-define( 'WP_INSTALLING', true );
+if ( isset( $_GET['step'] ) )
+        $step = $_GET['step'];
+else
+        $step = 0;
+
+if ( 'split_shared_terms' !== $step ) {
+        /**
+         * We are upgrading WordPress.
+         *
+         * @since 1.5.1
+         * @var bool
+         */
+        define( 'WP_INSTALLING', true );
+}
 
 /** Load WordPress Bootstrap */
 require( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
@@ -24 +31 @@
 
 delete_site_transient('update_core');
 
-if ( isset( $_GET['step'] ) )
-        $step = $_GET['step'];
-else
-        $step = 0;
-
 // Do it. No output.
 if ( 'upgrade_db' === $step ) {
         wp_upgrade();
         die( '0' );
+} elseif ( 'split_shared_terms' === $step ) {
+        split_all_shared_terms();
+        die( '0' );
 }
 
 /**

src/wp-includes/taxonomy.php

@@ -4251 +4251 @@
 
         // 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 ) {
+        if ( $current_db_version < 30133 && ! defined( 'WP_INSTALLING' ) ) {
                 return $term_id;
         }