Ticket #31149: 31149.diff

src/wp-includes/functions.php

@@ -3882 +3882 @@
         if ( ! is_multisite() )
                 return false;
 
-        static $global_terms = null;
-        if ( is_null( $global_terms ) ) {
+        $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
 
-                /**
-                 * Filter whether global terms are enabled.
-                 *
-                 * Passing a non-null value to the filter will effectively short-circuit the function,
-                 * returning the value of the 'global_terms_enabled' site option instead.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param null $anbled Whether global terms are enabled.
-                 */
-                $filter = apply_filters( 'global_terms_enabled', null );
-                if ( ! is_null( $filter ) )
-                        $global_terms = (bool) $filter;
-                else
-                        $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
-        }
-        return $global_terms;
+        /**
+         * Filter whether global terms are enabled.
+         *
+         * Passing a non-null value to the filter will effectively short-circuit the function,
+         * returning the value of the 'global_terms_enabled' site option instead.
+         *
+         * @since 3.0.0
+         *
+         * @param null $anbled Whether global terms are enabled.
+         */
+        return apply_filters( 'global_terms_enabled', $global_terms );
 }
 
 /**

src/wp-includes/ms-functions.php

@@ -1801 +1801 @@
                         $global_id = $wpdb->insert_id;
                 }
         } elseif ( $global_id != $term_id ) {
-                $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
+                $local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
                 if ( null != $local_id ) {
                         global_terms( $local_id );
                         if ( 10 < $global_terms_recurse ) {

new file tests/phpunit/tests/multisite/globalTerms.php

@@ +1 @@
+<?php
+if ( is_multisite() ) :
+
+/**
+ * @group taxonomy
+ * @group multisite
+ */
+class Tests_Multisite_GlobalTerms extends WP_UnitTestCase {
+        protected $suppress = false;
+        static $global_terms_table_exists = false;
+
+        public static function setUpBeforeClass() {
+                global $wpdb;
+
+                add_filter( 'global_terms_enabled', '__return_true' );
+
+                self::$global_terms_table_exists = (bool) $wpdb->get_results( "SHOW TABLES LIKE '{$wpdb->sitecategories}'" );
+                if ( ! self::$global_terms_table_exists ) {
+                        if ( ! function_exists( 'install_global_terms' ) ) {
+                                require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
+                        }
+
+                        install_global_terms();
+                }
+
+                self::commit_transaction();
+        }
+
+        public static function tearDownAfterClass() {
+                global $wpdb;
+
+                if ( ! self::$global_terms_table_exists ) {
+                        $wpdb->query( "DROP TABLE {$wpdb->sitecategories}" );
+                }
+
+                remove_filter( 'global_terms_enabled', '__return_true' );
+
+                self::commit_transaction();
+        }
+
+        /**
+         * @ticket 31149
+         */
+        public function test_conflict_between_global_and_local_term_id_should_be_resolved_via_recursion() {
+                global $wpdb;
+                $global_terms_exists = (bool)
+
+                $sites = $this->factory->blog->create_many( 2 );
+
+                /*
+                 * Fake a race condition by forcing a conflict between a global and a local term_id.
+                 *
+                 * On site 0:
+                 * * Create a 'foo' term.
+                 * * Fetch the ID of the corresponding term in the global terms table.
+                 *
+                 * On site 1:
+                 * * Create a dummy term.
+                 * * Update that term so that its local term_id matches the global_term_id identified above. This
+                 *   represents the race condition.
+                 * * Create a term 'foo' that will be matched in global terms but whose global_term_id will be a
+                 *   mismatch with the local term_id.
+                 */
+
+                switch_to_blog( $sites[0] );
+
+                $this->factory->category->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                ) );
+
+                // Get the randomly-generated global term ID.
+                $global_term_id = $wpdb->get_var( "SELECT cat_ID from $wpdb->sitecategories WHERE category_nicename = 'foo'" );
+
+                restore_current_blog();
+
+                // On site 1:
+                switch_to_blog( $sites[1] );
+
+                // Create a term, and then manually manipulate it to have a term_id conflict with the global term ID.
+                $s2_c1 = $this->factory->category->create();
+                $wpdb->update( $wpdb->terms, array( 'term_id' => $global_term_id ), array( 'term_id' => $s2_c1 ) );
+
+                // Now create a term that will trigger the conflict.
+                $s2_c2 = wp_insert_term( 'Foo', 'category', array(
+                        'slug' => 'foo',
+                ) );
+
+                restore_current_blog();
+
+                $this->assertEquals( $global_term_id, $s2_c2['term_id'] );
+        }
+}
+
+endif;