Ticket #31130: 31130.2.diff

src/wp-admin/admin.php

@@ -84 +84 @@
 auth_redirect();
 
 // Schedule trash collection
-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
+if ( !wp_next_scheduled('wp_scheduled_delete') && ! wp_installing() )
         wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
 
 set_screen_options();

src/wp-admin/includes/class-wp-upgrader.php

@@ -2593 +2593 @@
                 if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
                         return true;
 
-                if ( defined( 'WP_INSTALLING' ) )
+                if ( wp_installing() )
                         return true;
 
                 // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
@@ -3368 +3368 @@
 
                 // Plugins, Themes, Translations
                 foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-                
+
                         /**
                          * Filter to control whether a notification email is sent to the site admin email address for
                          * plugin, theme, and translation updates.

src/wp-admin/includes/file.php

@@ -1081 +1081 @@
                         $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
 
                 unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
-                if ( ! defined( 'WP_INSTALLING' ) ) {
+                if ( ! wp_installing() ) {
                         update_option( 'ftp_credentials', $stored_credentials );
                 }
                 return $credentials;

src/wp-admin/includes/misc.php

@@ -243 +243 @@
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-        if ( defined( "WP_INSTALLING" ) )
+        if ( wp_installing() )
                 return;
 
         if ( is_multisite() && ms_is_switched() ) {

src/wp-admin/includes/translation-install.php

@@ -94 +94 @@
  *               in an error, an empty array will be returned.
  */
 function wp_get_available_translations() {
-        if ( ! defined( 'WP_INSTALLING' ) && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
+        if ( ! wp_installing() && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
                 return $translations;
         }
 

src/wp-includes/functions.php

@@ -680 +680 @@
  *     add_query_arg( 'key', 'value', 'http://example.com' );
  *
  * Using an associative array:
- * 
+ *
  *     add_query_arg( array(
  *         'key1' => 'value1',
  *         'key2' => 'value2',
  *     ), 'http://example.com' );
- * 
+ *
  * Omitting the URL from either use results in the current URL being used
  * (the value of `$_SERVER['REQUEST_URI']`).
- * 
+ *
  * Values are expected to be encoded appropriately with urlencode() or rawurlencode().
  *
  * Setting any query variable's value to boolean false removes the key (see remove_query_arg()).
@@ -1260 +1260 @@
 }
 
 /**
+ * Check or set whether WordPress is in "installation" mode.
+ *
+ * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`.
+ *
+ * @since 4.4.0
+ *
+ * @staticvar bool $installing
+ *
+ * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off.
+ *                            Omit this parameter to fetch the current value.
+ * @return bool True if WP is installing, otherwise false.
+ */
+function wp_installing( $is_installing = null ) {
+        static $installing = null;
+
+        // Support for the `WP_INSTALLING` constant, defined before WP is loaded.
+        if ( is_null( $installing ) ) {
+                $installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+        }
+
+        if ( ! is_null( $is_installing ) ) {
+                $old_installing = $installing;
+                $installing = $is_installing;
+                return (bool) $old_installing;
+        }
+
+        return (bool) $installing;
+}
+
+/**
  * Test whether blog is already installed.
  *
  * The cache will be checked first. If you have a cache plugin, which saves
@@ -1285 +1315 @@
                 return true;
 
         $suppress = $wpdb->suppress_errors();
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
                 $alloptions = wp_load_alloptions();
         }
         // If siteurl is not set to autoload, check it specifically
@@ -3335 +3365 @@
         }
 
         // If installing or in the admin, provide the verbose message.
-        if ( defined('WP_INSTALLING') || defined('WP_ADMIN') )
+        if ( wp_installing() || defined('WP_ADMIN') )
                 wp_die($wpdb->error);
 
         // Otherwise, be terse.

src/wp-includes/l10n.php

@@ -53 +53 @@
         // If multisite, check options.
         if ( is_multisite() ) {
                 // Don't check blog option when installing.
-                if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
+                if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
                         $ms_locale = get_site_option( 'WPLANG' );
                 }
 
@@ -565 +565 @@
                 return $return;
         }
 
-        if ( is_admin() || defined( 'WP_INSTALLING' ) || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
+        if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
                 load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
         }
 

src/wp-includes/load.php

@@ -165 +165 @@
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-        if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
+        if ( !file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
                 return;
 
         global $upgrading;
@@ -475 +475 @@
  */
 function wp_not_installed() {
         if ( is_multisite() ) {
-                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
+                if ( ! is_blog_installed() && ! wp_installing() ) {
                         nocache_headers();
 
                         wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
                 }
-        } elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
+        } elseif ( ! is_blog_installed() && ! wp_installing() ) {
                 nocache_headers();
 
                 require( ABSPATH . WPINC . '/kses.php' );
@@ -539 +539 @@
 function wp_get_active_and_valid_plugins() {
         $plugins = array();
         $active_plugins = (array) get_option( 'active_plugins', array() );
-        if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
+        if ( empty( $active_plugins ) || wp_installing() )
                 return $plugins;
 
         $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;

src/wp-includes/ms-functions.php

@@ -1174 +1174 @@
         if ( domain_exists($domain, $path, $site_id) )
                 return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
 
-        if ( !defined('WP_INSTALLING') )
-                define( 'WP_INSTALLING', true );
+        if ( ! wp_installing() ) {
+                wp_installing( true );
+        }
 
         if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
                 return new WP_Error('insert_blog', __('Could not create site.'));
@@ -2228 +2229 @@
         if ( !is_main_site() )
                 return;
 
-        if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') )
+        if ( !wp_next_scheduled('update_network_counts') && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
 }
 

src/wp-includes/ms-settings.php

@@ -136 +136 @@
         }
 
         // @todo Investigate when exactly this can occur.
-        if ( empty( $current_blog ) && defined( 'WP_INSTALLING' ) ) {
+        if ( empty( $current_blog ) && wp_installing() ) {
                 $current_blog = new stdClass;
                 $current_blog->blog_id = $blog_id = 1;
         }

src/wp-includes/option.php

@@ -53 +53 @@
         if ( defined( 'WP_SETUP_CONFIG' ) )
                 return false;
 
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
                 // prevent non-existent options from triggering multiple queries
                 $notoptions = wp_cache_get( 'notoptions', 'options' );
                 if ( isset( $notoptions[ $option ] ) ) {
@@ -171 +171 @@
 function wp_load_alloptions() {
         global $wpdb;
 
-        if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
+        if ( ! wp_installing() || ! is_multisite() )
                 $alloptions = wp_cache_get( 'alloptions', 'options' );
         else
                 $alloptions = false;
@@ -185 +185 @@
                 foreach ( (array) $alloptions_db as $o ) {
                         $alloptions[$o->option_name] = $o->option_value;
                 }
-                if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
+                if ( ! wp_installing() || ! is_multisite() )
                         wp_cache_add( 'alloptions', $alloptions, 'options' );
         }
 
@@ -204 +204 @@
 function wp_load_core_site_options( $site_id = null ) {
         global $wpdb;
 
-        if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
+        if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
                 return;
 
         if ( empty($site_id) )
@@ -332 +332 @@
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
         }
 
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
                 $alloptions = wp_load_alloptions();
                 if ( isset( $alloptions[$option] ) ) {
                         $alloptions[ $option ] = $serialized_value;
@@ -433 +433 @@
         if ( ! $result )
                 return false;
 
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
                 if ( 'yes' == $autoload ) {
                         $alloptions = wp_load_alloptions();
                         $alloptions[ $option ] = $serialized_value;
@@ -509 +509 @@
         do_action( 'delete_option', $option );
 
         $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
                 if ( 'yes' == $row->autoload ) {
                         $alloptions = wp_load_alloptions();
                         if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
@@ -629 +629 @@
                 $value = wp_cache_get( $transient, 'transient' );
         } else {
                 $transient_option = '_transient_' . $transient;
-                if ( ! defined( 'WP_INSTALLING' ) ) {
+                if ( ! wp_installing() ) {
                         // If option is not in alloptions, it is not autoloaded and thus has a timeout
                         $alloptions = wp_load_alloptions();
                         if ( !isset( $alloptions[$transient_option] ) ) {

src/wp-includes/script-loader.php

@@ -829 +829 @@
 function wp_style_loader_src( $src, $handle ) {
         global $_wp_admin_css_colors;
 
-        if ( defined('WP_INSTALLING') )
+        if ( wp_installing() )
                 return preg_replace( '#^wp-admin/#', './', $src );
 
         if ( 'colors' == $handle ) {

src/wp-includes/theme.php

@@ -771 +771 @@
          *
          * @param bool true Validation flag to check the current theme.
          */
-        if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) )
+        if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
                 return true;
 
         if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {

src/wp-includes/update.php

@@ -22 +22 @@
  * @param bool  $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set.
  */
 function wp_version_check( $extra_stats = array(), $force_check = false ) {
-        if ( defined( 'WP_INSTALLING' ) ) {
+        if ( wp_installing() ) {
                 return;
         }
 
@@ -187 +187 @@
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  */
 function wp_update_plugins( $extra_stats = array() ) {
-        if ( defined( 'WP_INSTALLING' ) ) {
+        if ( wp_installing() ) {
                 return;
         }
 
@@ -344 +344 @@
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  */
 function wp_update_themes( $extra_stats = array() ) {
-        if ( defined( 'WP_INSTALLING' ) ) {
+        if ( wp_installing() ) {
                 return;
         }
         global $wp_version;
@@ -636 +636 @@
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-        if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') )
+        if ( ! wp_next_scheduled('wp_version_check') && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
 
-        if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
+        if ( ! wp_next_scheduled('wp_update_plugins') && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
 
-        if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
+        if ( ! wp_next_scheduled('wp_update_themes') && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
 
-        if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! wp_installing() ) {
                 // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
                 $next = strtotime( 'today 7am' );
                 $now = time();

src/wp-settings.php

@@ -321 +321 @@
 $GLOBALS['wp_locale'] = new WP_Locale();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
-if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
+if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
         if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
                 include( STYLESHEETPATH . '/functions.php' );
         if ( file_exists( TEMPLATEPATH . '/functions.php' ) )

tests/phpunit/includes/factory.php

@@ -173 +173 @@
                 $suppress = $wpdb->suppress_errors();
                 $blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
                 $wpdb->suppress_errors( $suppress );
+
+                // Tell WP we're done installing.
+                wp_installing( false );
+
                 return $blog;
         }
 

tests/phpunit/includes/testcase.php

@@ -14 +14 @@
         protected static $hooks_saved = array();
         protected static $ignore_files;
 
-        protected $db_version;
-
         /**
          * @var WP_UnitTest_Factory
          */
@@ -57 +55 @@
                 add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
 
                 add_filter( 'wp_mail', array( $this, 'set_wp_mail_globals' ) );
-
-                /*
-                 * During multisite tests, WP_INSTALLING forces `get_option()` to miss the cache, which causes problems
-                 * with our query-counting cache tests. As a workaround in the case of tests that require checking
-                 * 'db_version' (such as any test that uses the Term Meta API), we filter 'pre_option_db_version' and
-                 * avoid hitting the database.
-                 *
-                 * See #31130.
-                 */
-                $this->db_version = get_option( 'db_version' );
-                if ( is_multisite() ) {
-                        add_filter( 'pre_option_db_version', array( $this, 'db_version' ) );
-                }
         }
 
         /**
@@ -632 +617 @@
                         return wp_delete_user( $user_id );
                 }
         }
-
-        /**
-         * Return the current database version without hitting the database.
-         *
-         * This is used to bypass cache problems with some multisite tests. See #31130.
-         *
-         * @todo Don't do this anymore once #31130 is fixed.
-         *
-         * @since 4.4.0
-         */
-        public function db_version() {
-                return $this->db_version;
-        }
 }

tests/phpunit/tests/comment/getPageOfComment.php

@@ -60 +60 @@
          * @ticket 11334
          */
         public function test_subsequent_calls_should_hit_cache() {
-                // `get_page_of_comment()` calls `get_option()`, which is not properly cached when WP_INSTALLING.
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
 
                 $p = $this->factory->post->create();

tests/phpunit/tests/general/archives.php

@@ -16 +16 @@
         function test_get_archives_cache() {
                 global $wpdb;
 
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 $this->factory->post->create_many( 15, array( 'post_type' => 'post' ) );
                 wp_cache_delete( 'last_changed', 'posts' );
                 $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
@@ -112 +108 @@
                 $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );
                 $this->assertEquals( $num_queries, $wpdb->num_queries );
         }
-}
- No newline at end of file
+}

tests/phpunit/tests/option/transient.php

@@ -38 +38 @@
          * @ticket 22807
          */
         function test_transient_data_with_timeout() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
-                }
-
                 if ( wp_using_ext_object_cache() ) {
                         $this->markTestSkipped( 'Not testable with an external object cache.' );
                 }
@@ -67 +63 @@
          * @ticket 22807
          */
         function test_transient_add_timeout() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
-                }
-
                 if ( wp_using_ext_object_cache() ) {
                         $this->markTestSkipped( 'Not testable with an external object cache.' );
                 }
@@ -130 +122 @@
          * @ticket 30380
          */
         function test_nonexistent_key_old_timeout() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
-                }
-
                 if ( wp_using_ext_object_cache() ) {
                         $this->markTestSkipped( 'Not testable with an external object cache.' );
                 }

tests/phpunit/tests/option/updateOption.php

@@ -20 +20 @@
          * @ticket 26394
          */
         public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_missing() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 wp_cache_flush();
                 update_option( 'test_update_option_default', 'value' );
@@ -44 +40 @@
          * @ticket 26394
          */
         public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_yes() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 wp_cache_flush();
                 update_option( 'test_update_option_default', 'value', 'yes' );
@@ -68 +60 @@
          * @ticket 26394
          */
         public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_no() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 wp_cache_flush();
                 update_option( 'test_update_option_default', 'value', 'no' );
@@ -93 +81 @@
          * @ticket 26394
          */
         public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_false() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 wp_cache_flush();
                 update_option( 'test_update_option_default', 'value', false );
@@ -118 +102 @@
          * @group 26394
          */
         public function test_autoload_should_be_updated_for_existing_option_when_value_is_changed() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 add_option( 'foo', 'bar', '', 'no' );
                 $updated = update_option( 'foo', 'bar2', true );
@@ -143 +123 @@
          * @group 26394
          */
         public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_unchanged() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 add_option( 'foo', 'bar', '', 'yes' );
                 $updated = update_option( 'foo', 'bar', false );
@@ -169 +145 @@
          * @group 26394
          */
         public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_changed_but_no_value_of_autoload_is_provided() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 global $wpdb;
                 add_option( 'foo', 'bar', '', 'yes' );
 

tests/phpunit/tests/post/getPostClass.php

@@ -108 +108 @@
         public function test_taxonomy_classes_hit_cache() {
                 global $wpdb;
 
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 register_taxonomy( 'wptests_tax', 'post' );
                 wp_set_post_terms( $this->post_id, array( 'foo', 'bar' ), 'wptests_tax' );
                 wp_set_post_terms( $this->post_id, array( 'footag', 'bartag' ), 'post_tag' );

tests/phpunit/tests/term/getTerms.php

@@ -382 +382 @@
         public function test_child_of_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
                 global $wpdb;
 
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
 
                 $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
@@ -1327 +1323 @@
         public function test_parent_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
                 global $wpdb;
 
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
-                }
-
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
 
                 $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );

tests/phpunit/tests/term/wpInsertTerm.php

@@ -468 +468 @@
          * @ticket 5809
          */
         public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() {
-
-                // See #31130.
                 $old_db_version = 30055;
-                if ( is_multisite() ) {
-                        $_db_version = $this->db_version;
-                        $this->db_version = $old_db_version;
-                } else {
-                        update_option( 'db_version', $old_db_version );
-                }
+                update_option( 'db_version', $old_db_version );
 
                 register_taxonomy( 'wptests_tax', 'post' );
                 register_taxonomy( 'wptests_tax_2', 'post' );
@@ -503 +496 @@
                 $this->assertSame( 'foo-2', $new_term->slug );
                 $this->assertNotEquals( $new_term->term_id, $term->term_id );
 
-                if ( is_multisite() ) {
-                        $this->db_version = $_db_version;
-                }
-
                 _unregister_taxonomy( 'wptests_tax', 'post' );
         }