Changeset 38787

Timestamp:

10/14/2016 12:04:50 PM (8 years ago)

Author:

johnbillion

Message:

Users: Use the role name instead of the role display name when fetching the list of users with no role. This avoids false positives when dealing with user roles that, for example, contain spaces in the display name.

Props procodewp, choongsavvii
Fixes #38234

Location:

trunk

Files:

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

trunk/src/wp-includes/user.php

@@ -2441 +2441 @@
 
     $prefix = $wpdb->get_blog_prefix();
-    $regex  = implode( '|', wp_roles()->get_names() );
+    $regex  = implode( '|', array_keys( wp_roles()->get_names() ) );
     $regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
     $users  = $wpdb->get_col( $wpdb->prepare( "

trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php

@@ -82 +82 @@
     }
 
+    /**
+     * Role comparison must be done on role name, not role display name.
+     *
+     * @ticket 38234
+     */
+    public function test_get_users_with_no_role_matches_on_role_name() {
+        // Create a role with a display name which would not match the role name
+        // in a case-insentive SQL query.
+        wp_roles()->add_role( 'somerole', 'Some role display name' );
+
+        $someuser = self::factory()->user->create( array(
+            'role' => 'somerole',
+        ) );
+
+        $users = wp_get_users_with_no_role();
+
+        wp_roles()->remove_role( 'somerole' );
+
+        $this->assertEmpty( $users );
+    }
+
 }