Changeset 40560 for trunk/src/wp-includes/user.php

Timestamp:

04/30/2017 01:02:50 PM (8 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

File:

• trunk/src/wp-includes/user.php (modified) (2 diffs)

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 ) {