Changeset 41242 for trunk/tests/phpunit/tests/multisite/network.php

Timestamp:

08/12/2017 01:10:24 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Remove references to $wpdb->siteid and use get_current_network_id() instead.

Props sathyapulse, spacedmonkey.
Fixes #41507.

File:

• trunk/tests/phpunit/tests/multisite/network.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/network.php

@@ -190 +190 @@
      */
     public function test_get_blog_count_on_different_network() {
-        global $current_site, $wpdb;
-
-        // switch_to_network()...
-        $orig_network_id = $current_site->id;
-        $orig_wpdb_network_id = $wpdb->siteid;
-        $current_site->id = self::$different_network_id;
-        $wpdb->siteid = self::$different_network_id;
-        wp_update_network_site_counts();
-        $current_site->id = $orig_network_id;
-        $wpdb->siteid = $orig_wpdb_network_id;
+        wp_update_network_site_counts( self::$different_network_id );
 
         $site_count = get_blog_count( self::$different_network_id );
@@ -210 +201 @@
      */
     public function test_get_user_count_on_different_network() {
-        global $current_site, $wpdb;
-
         wp_update_network_user_counts();
         $current_network_user_count = get_user_count();
 
-        // switch_to_network()...
-        $orig_network_id = $current_site->id;
-        $orig_wpdb_network_id = $wpdb->siteid;
-        $current_site->id = self::$different_network_id;
-        $wpdb->siteid = self::$different_network_id;
-
         // Add another user to fake the network user count to be different.
         wpmu_create_user( 'user', 'pass', 'email' );
 
-        wp_update_network_user_counts();
-
-        // restore_current_network()...
-        $current_site->id = $orig_network_id;
-        $wpdb->siteid = $orig_wpdb_network_id;
+        wp_update_network_user_counts( self::$different_network_id );
 
         $user_count = get_user_count( self::$different_network_id );