Ticket #42014: 42014.diff

src/wp-includes/user.php

@@ -855 +855 @@
         $result = array();
 
         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.
                 $select_count = array();

tests/phpunit/tests/user/countUsers.php

@@ -134 +134 @@
         }
 
         /**
+         * @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'] );
+        }
+
+        /**
          * @ticket 34495
          *
          * @dataProvider data_count_users_strategies