Changeset 35707

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

Location:

trunk

Files:

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

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;

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

@@ -141 +141 @@
     }
 
+    /**
+     * @ticket 34495
+     *
+     * @dataProvider data_count_users_strategies
+     */
+    public function test_count_users_is_accurate_with_multiple_roles( $strategy ) {
+
+        // Setup users
+        $admin = self::factory()->user->create( array(
+            'role' => 'administrator',
+        ) );
+        $editor = self::factory()->user->create( array(
+            'role' => 'editor',
+        ) );
+
+        get_userdata( $editor )->add_role( 'author' );
+
+        $this->assertEquals( array(
+            'editor',
+            'author'
+        ), get_userdata( $editor )->roles );
+
+        // Test user counts
+        $count = count_users( $strategy );
+
+        $this->assertEquals( 3, $count['total_users'] );
+        $this->assertEquals( array(
+            'administrator' => 2,
+            'editor'        => 1,
+            'author'        => 1,
+            'none'          => 0,
+        ), $count['avail_roles'] );
+
+    }
+
     function data_count_users_strategies() {
         return array(