sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Users: Ensure user counts remain accurate if users are added to or removed from the users table without corresponding usermeta entries being added or removed.

Browse Source 
This has a slight performance impact on sites with a large number of users when the `time` strategy is used for counting users. Hopefully this impact will be negated by enhancements proposed in #38741.

Props psoluch, dots, boonebgorges, ptbello, tharsheblows

Fixes #29785


git-svn-id: https://develop.svn.wordpress.org/trunk@40560 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2017-04-30 13:02:50 +00:00
parent 7c1d20422f
commit c2fd41759c
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,7 +857,12 @@ function count_users($strategy = 'time') {
$select_count = implode(', ', $select_count);
// Add the meta_value index to the selection list, then run the query.
$row = $wpdb->get_row( "SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N );
$row = $wpdb->get_row( "
SELECT {$select_count}, COUNT(*)
FROM {$wpdb->usermeta}
INNER JOIN {$wpdb->users} ON user_id = ID
WHERE meta_key = '{$blog_prefix}capabilities'
", ARRAY_N );
// Run the previous loop again to associate results with role names.
$col = 0;
@ -881,7 +886,12 @@ function count_users($strategy = 'time') {
'none' => 0,
);
$users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
$users_of_blog = $wpdb->get_col( "
SELECT meta_value
FROM {$wpdb->usermeta}
INNER JOIN {$wpdb->users} ON user_id = ID
WHERE meta_key = '{$blog_prefix}capabilities'
" );
foreach ( $users_of_blog as $caps_meta ) {
$b_roles = maybe_unserialize($caps_meta);

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

@ -171,6 +171,31 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
}
/**
* @ticket 29785
*
* @dataProvider data_count_users_strategies
*/
public function test_count_users_should_not_count_users_who_are_not_in_posts_table( $strategy ) {
global $wpdb;
// Get a 'before' count for comparison.
$count = count_users( $strategy );
$u = self::factory()->user->create( array(
'role' => 'editor',
) );
// Manually delete the user, but leave the capabilities usermeta.
$wpdb->delete( $wpdb->users, array(
'ID' => $u,
) );
$count2 = count_users( $strategy );
$this->assertEqualSets( $count, $count2 );
}
function data_count_users_strategies() {
return array(
array(