Changeset 40560

Timestamp:

04/30/2017 01:02:50 PM (7 years ago)

Author:

johnbillion

Message:

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.

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

Location:

trunk

Files:

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

trunk/src/wp-includes/user.php

@@ -858 +858 @@
 
         // 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.
@@ -882 +887 @@
         );
 
-        $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 ) {

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

@@ -170 +170 @@
         ), $count['avail_roles'] );
 
+    }
+
+    /**
+     * @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 );
     }