Changeset 35707 for trunk/src/wp-includes/user-functions.php

Timestamp:

11/19/2015 05:10:47 PM (10 years ago)

Author:

johnbillion

Message:

Ensure the count for users with no role remains accurate when users with multiple roles are present.

See #34495

File:

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

trunk/src/wp-includes/user-functions.php

@@ -759 +759 @@
             $select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%');
         }
+        $select_count[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))";
         $select_count = implode(', ', $select_count);
 
@@ -774 +775 @@
         }
 
+        $role_counts['none'] = (int) $row[$col++];
+
         // Get the meta_value index from the end of the result set.
         $total_users = (int) $row[$col];
-
-        $role_counts['none'] = ( $total_users - array_sum( $role_counts ) );
 
         $result['total_users'] = $total_users;