mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-01-17 21:08:44 +01:00
Code Issues Actions 99 Packages Projects Releases Wiki Activity

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

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@41653 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz 2017-09-30 03:53:27 +00:00
parent 75c4cb98f4
commit 761c45157e
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/user.php
View File

@ -855,7 +855,13 @@ function count_users( $strategy = 'time', $site_id = null ) {
$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();

24
tests/phpunit/tests/user/countUsers.php
View File

@ -133,6 +133,30 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
}
/**
* @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
*