Changeset 41661 for trunk/tests/phpunit/tests/user/multisite.php

Timestamp:

10/02/2017 01:43:48 AM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_current_blog_id() instead of $wpdb->blogid.

get_current_blog_id() is more appropriate for determining the ID of the current site in most cases. This eliminates the need for the global $wpdb in several functions and is better than the implicit global used in admin pages.

Props bnap00, spacedmonkey.
Fixes #41684.

File:

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

trunk/tests/phpunit/tests/user/multisite.php

@@ -121 +121 @@
 
         $this->assertTrue( is_blog_user() );
-        $this->assertTrue( is_blog_user( $wpdb->blogid ) );
+        $this->assertTrue( is_blog_user( get_current_blog_id() ) );
 
         $blog_ids = array();
@@ -150 +150 @@
 
         wp_set_current_user( $user1_id );
+        $site_id = get_current_blog_id();
 
         $this->assertTrue( is_user_member_of_blog() );
         $this->assertTrue( is_user_member_of_blog( 0, 0 ) );
-        $this->assertTrue( is_user_member_of_blog( 0, $wpdb->blogid ) );
+        $this->assertTrue( is_user_member_of_blog( 0, $site_id ) );
         $this->assertTrue( is_user_member_of_blog( $user1_id ) );
-        $this->assertTrue( is_user_member_of_blog( $user1_id, $wpdb->blogid ) );
+        $this->assertTrue( is_user_member_of_blog( $user1_id, $site_id ) );
 
         $blog_ids = self::factory()->blog->create_many( 1 );