Changeset 41654

Timestamp:

09/30/2017 04:09:11 AM (7 years ago)

Author:

flixos90

Message:

Multisite: Fix wp_get_users_with_no_role() possibly including users with a role on a different site.

Prior to this change, when passing another site than the current one to wp_get_users_with_no_role() through its $site_id parameter, the function still used the roles available on the current site, which would cause users with other roles that possibly exist on the other site to show up as users without a role. Switching the site before retrieving the available rules fixes the issue.

Fixes #42015.

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

@@ -2521 +2521 @@
 
     $prefix = $wpdb->get_blog_prefix( $site_id );
-    $regex  = implode( '|', array_keys( wp_roles()->get_names() ) );
+
+    if ( is_multisite() && $site_id != get_current_blog_id() ) {
+        switch_to_blog( $site_id );
+        $role_names = wp_roles()->get_names();
+        restore_current_blog();
+    } else {
+        $role_names = wp_roles()->get_names();
+    }
+
+    $regex  = implode( '|', array_keys( $role_names ) );
     $regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
     $users  = $wpdb->get_col( $wpdb->prepare( "

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

@@ -102 +102 @@
     }
 
+    /**
+     * @ticket 42015
+     * @group multisite
+     * @group ms-required
+     */
+    public function test_get_users_with_no_role_matches_on_role_name_different_site() {
+        $site_id = (int) self::factory()->blog->create();
+
+        switch_to_blog( $site_id );
+        wp_roles()->add_role( 'somerole', 'Some role display name' );
+        $user_id = self::factory()->user->create( array(
+            'role' => 'somerole',
+        ) );
+        restore_current_blog();
+
+        $users = wp_get_users_with_no_role( $site_id );
+
+        $this->assertEmpty( $users );
+    }
+
 }