Ticket #29785: 29785.3.diff

src/wp-includes/user.php

@@ -857 +857 @@
                 $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 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 +881 @@
                         '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 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);

tests/phpunit/tests/user/countUsers.php

@@ -186 +186 @@
                 );
         }
 
+        /**
+         * @ticket 29785
+         */
+        public function test_should_not_count_users_who_are_not_in_posts_table_memory() {
+                global $wpdb;
+
+                // Get a 'before' count for comparison.
+                $count = count_users( 'memory' );
+
+                $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( 'memory' );
+
+                $this->assertEqualSets( $count, $count2 );
+        }
+        /**
+         * @ticket 29785
+         */
+        public function test_should_not_count_users_who_are_not_in_posts_table_time() {
+                global $wpdb;
+
+                // Get a 'before' count for comparison.
+                $count = count_users( 'time' );
+
+                $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( 'time' );
+
+                $this->assertEqualSets( $count, $count2 );
+        }
 }