Changeset 63544

Timestamp:

09/08/2026 09:30:28 PM (6 weeks ago)

Author:

joedolson

Message:

Multisite: Restore missing user reassignment dropdown when deleting user.

Explicitly pass the blog_id attribute to wp_dropdown_users in confirm_delete_users() so that the dropdown renders the list of users appropriate to the current site, rather than attempting to fallback to the main site despite the limits set by the include parameter, which limited to members of the subsite. This resulted in an empty list in any case where there was no overlap between members of the current subset and members of the primary network site.

Props mgyura, johnbillion, adamsilverstein, joedolson.
Fixes #66012.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/ms.php

@@ -1004 +1004 @@
                                                                                                 'show'    => 'display_name_with_login',
                                                                                                 'id'      => "reassign_user_{$details->userblog_id}_{$delete_user->ID}",
+                                                                                                'blog_id' => $details->userblog_id,
                                                                                         )
                                                                                 );

trunk/tests/phpunit/tests/user/wpDropdownUsers.php

@@ -202 +202 @@
                 $this->assertStringContainsString( $u2->user_login, $found );
         }
+
+        /**
+         * @ticket 66012
+         * @group ms-required
+         */
+        public function test_multisite_users_in_blog_id() {
+                $blog_id = self::factory()->blog->create();
+                $users   = self::factory()->user->create_many( 2 );
+
+                add_user_to_blog( $blog_id, $users[0], 'author' );
+                add_user_to_blog( $blog_id, $users[1], 'author' );
+
+                // The main site has no authors, so the dropdown should be empty.
+                $found_main_site = wp_dropdown_users(
+                        array(
+                                'echo'    => false,
+                                'role'    => 'author',
+                                'show'    => 'user_login',
+                                'blog_id' => get_current_blog_id(),
+                        )
+                );
+
+                $this->assertSame( '', $found_main_site );
+
+                $found_sub_site = wp_dropdown_users(
+                        array(
+                                'echo'    => false,
+                                'role'    => 'author',
+                                'show'    => 'user_login',
+                                'blog_id' => $blog_id,
+                        )
+                );
+
+                $user1 = get_userdata( $users[0] );
+                $user2 = get_userdata( $users[1] );
+
+                $this->assertStringContainsString( $user1->user_login, $found_sub_site );
+                $this->assertStringContainsString( $user2->user_login, $found_sub_site );
+        }
 }