Changeset 41653

Timestamp:

09/30/2017 03:53:27 AM (7 years ago)

Author:

flixos90

Message:

Multisite: Fix count_users() possibly querying incorrect roles when passed a different site ID.

The time strategy in count_users() queries users by role. However, the roles queried for were not affected by passing another site than the current one through the $site_id parameter, causing users having roles that were not queried for to appear as users without a role. This changeset fixes the issue by switching the site before retrieving the roles to query for.

Fixes #42014.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (1 diff)
• tests/phpunit/tests/user/countUsers.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -856 +856 @@
 
     if ( 'time' == $strategy ) {
-        $avail_roles = wp_roles()->get_names();
+        if ( is_multisite() && $site_id != get_current_blog_id() ) {
+            switch_to_blog( $site_id );
+            $avail_roles = wp_roles()->get_names();
+            restore_current_blog();
+        } else {
+            $avail_roles = wp_roles()->get_names();
+        }
 
         // Build a CPU-intensive query that will return concise information.

trunk/tests/phpunit/tests/user/countUsers.php

@@ -132 +132 @@
         ), $count['avail_roles'] );
 
+    }
+
+    /**
+     * @ticket 42014
+     * @group multisite
+     * @group ms-required
+     *
+     * @dataProvider data_count_users_strategies
+     */
+    public function test_count_users_multisite_queries_correct_roles( $strategy ) {
+        $site_id = (int) self::factory()->blog->create();
+
+        switch_to_blog( $site_id );
+        wp_roles()->add_role( 'tester', 'Tester', array( 'test' => true ) );
+        $user_id = self::factory()->user->create( array(
+            'role' => 'tester',
+        ) );
+        restore_current_blog();
+
+        $count = count_users( $strategy, $site_id );
+        $this->assertEqualSetsWithIndex( array(
+            'tester' => 1,
+            'none'   => 0,
+        ), $count['avail_roles'] );
     }