From 342f997f410b3ba10c60f5e088ebd6eb20000e6e Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 10:28:51 +0200
Subject: [PATCH 01/20] Update heading

---
 src/wp-admin/includes/ms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index bef197410bb83..6b2ea0c02c352 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -865,7 +865,7 @@ function confirm_delete_users( $users ) {
 		return false;
 	}
 	?>
-	<h1><?php esc_html_e( 'Users' ); ?></h1>
+	<h1><?php esc_html_e( 'Delete Users' ); ?></h1>
 
 	<?php if ( 1 === count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>

From 58b709f263930b3d3d23125ada652b5c00134dfb Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 10:33:48 +0200
Subject: [PATCH 02/20] Remove default selected option

---
 src/wp-admin/includes/ms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 6b2ea0c02c352..bdbd27e1fc2a5 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -963,7 +963,7 @@ function confirm_delete_users( $users ) {
 								printf( __( 'Site: %s' ), $user_site );
 								?>
 							</li>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" checked="checked" />
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" />
 							<?php _e( 'Delete all content.' ); ?></label></li>
 							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />
 							<?php _e( 'Attribute all content to:' ); ?></label>

From fcb23c1ed659c0733ae72a4556a004c358b3b475 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:10:32 +0200
Subject: [PATCH 03/20] Typecast allusers parameter and reuse variable

---
 src/wp-admin/includes/ms.php   | 3 +--
 src/wp-admin/network/users.php | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index bdbd27e1fc2a5..59f7c6cc7feb0 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -882,8 +882,7 @@ function confirm_delete_users( $users ) {
 	?>
 	<table class="form-table" role="presentation">
 	<?php
-	$allusers = (array) $_POST['allusers'];
-	foreach ( $allusers as $user_id ) {
+	foreach ( $users as $user_id ) {
 		if ( '' !== $user_id && '0' !== $user_id ) {
 			$delete_user = get_userdata( $user_id );
 
diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php
index 7ddd5f40a662b..a908b06f6a0c7 100644
--- a/src/wp-admin/network/users.php
+++ b/src/wp-admin/network/users.php
@@ -56,8 +56,9 @@
 
 				$doaction     = $_POST['action'];
 				$userfunction = '';
+				$allusers     = (array) $_POST['allusers'];
 
-				foreach ( (array) $_POST['allusers'] as $user_id ) {
+				foreach ( $allusers as $user_id ) {
 					if ( ! empty( $user_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
@@ -72,7 +73,7 @@
 								require_once ABSPATH . 'wp-admin/admin-header.php';
 
 								echo '<div class="wrap">';
-								confirm_delete_users( $_POST['allusers'] );
+								confirm_delete_users( $allusers );
 								echo '</div>';
 
 								require_once ABSPATH . 'wp-admin/admin-footer.php';

From 6328326755071822ae6b32cb824ab5f943dd904b Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:11:01 +0200
Subject: [PATCH 04/20] Add TODO

---
 src/wp-admin/includes/ms.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 59f7c6cc7feb0..09c2414e25e81 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -905,6 +905,8 @@ function confirm_delete_users( $users ) {
 					)
 				);
 			}
+
+			// TODO: Check if user has content.
 			?>
 			<tr>
 				<th scope="row"><?php echo $delete_user->user_login; ?>

From abc9cc9f431bf52d2ff2474ad7e03969eefac809 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:13:32 +0200
Subject: [PATCH 05/20] Update variable

---
 src/wp-admin/includes/ms.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 09c2414e25e81..8860f6e5eb6d8 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -945,7 +945,7 @@ function confirm_delete_users( $users ) {
 						$user_list      = '';
 
 						foreach ( $blog_users as $user ) {
-							if ( ! in_array( (int) $user->ID, $allusers, true ) ) {
+							if ( ! in_array( (int) $user->ID, $users, true ) ) {
 								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
 							}
 						}
@@ -987,7 +987,7 @@ function confirm_delete_users( $users ) {
 	</table>
 	<?php
 	/** This action is documented in wp-admin/users.php */
-	do_action( 'delete_user_form', $current_user, $allusers );
+	do_action( 'delete_user_form', $current_user, $users );
 
 	if ( 1 === count( $users ) ) :
 		?>

From 1ac17bdacbeaf774be4ccc74ec9300432e801c37 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:13:51 +0200
Subject: [PATCH 06/20] Exclude user to delete from reassignment dropdown

---
 src/wp-admin/includes/ms.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 8860f6e5eb6d8..e0408d7b366af 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -864,6 +864,7 @@ function confirm_delete_users( $users ) {
 	if ( ! is_array( $users ) || empty( $users ) ) {
 		return false;
 	}
+
 	?>
 	<h1><?php esc_html_e( 'Delete Users' ); ?></h1>
 
@@ -932,6 +933,7 @@ function confirm_delete_users( $users ) {
 						array(
 							'blog_id' => $details->userblog_id,
 							'fields'  => array( 'ID', 'user_login' ),
+							'exclude' => $users,
 						)
 					);
 

From 908a25cea981dcbe60ab91d7109eb7a74414aa70 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:33:06 +0200
Subject: [PATCH 07/20] Add ID to submit button

---
 src/wp-admin/includes/ms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index e0408d7b366af..ace6e91d6ec9b 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -999,7 +999,7 @@ function confirm_delete_users( $users ) {
 		<?php
 	endif;
 
-	submit_button( __( 'Confirm Deletion' ), 'primary' );
+	submit_button( __( 'Confirm Deletion' ), 'primary', 'submit', false, array( 'id' => 'confirm-users-deletion' ) );
 	?>
 	</form>
 	<?php

From c2b7fbd0b56be2f01d1bdee27fafeffac057c6ff Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:33:23 +0200
Subject: [PATCH 08/20] Add TODO

---
 src/wp-admin/includes/ms.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index ace6e91d6ec9b..3fed1c6aa8480 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -966,6 +966,7 @@ function confirm_delete_users( $users ) {
 								printf( __( 'Site: %s' ), $user_site );
 								?>
 							</li>
+							<?php // TODO: Fix duplicate IDs ?>
 							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" />
 							<?php _e( 'Delete all content.' ); ?></label></li>
 							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />

From b366373f9257aa32ba92f26575794a99ab1e28c1 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:33:37 +0200
Subject: [PATCH 09/20] Disable button if nothing is selected

---
 src/js/_enqueues/admin/common.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 358948d306cf6..da1487b818191 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2354,3 +2354,15 @@ $( function( $ ) {
 	// Expose public methods.
 	return pub;
 })();
+
+
+// Disable Confirm Deletion button until delete or reassignemnt is selected.
+( function( $ ) {
+	var $deleteButton = $( '#confirm-users-deletion' );
+
+	if ( ! $deleteButton.length ) {
+		return;
+	}
+
+	$deleteButton.prop( 'disabled', true );
+}( jQuery ));

From 1d4cd348ac29ab6b41ab6e74673bac43248ec250 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 11:42:14 +0200
Subject: [PATCH 10/20] Use wp_dropdown_users()

---
 src/wp-admin/includes/ms.php | 38 +++++++++++++++---------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 3fed1c6aa8480..237fbe52a3a58 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -879,7 +879,6 @@ function confirm_delete_users( $users ) {
 	<?php
 	wp_nonce_field( 'ms-users-delete' );
 	$site_admins = get_super_admins();
-	$admin_out   = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>';
 	?>
 	<table class="form-table" role="presentation">
 	<?php
@@ -932,32 +931,16 @@ function confirm_delete_users( $users ) {
 					$blog_users = get_users(
 						array(
 							'blog_id' => $details->userblog_id,
-							'fields'  => array( 'ID', 'user_login' ),
+							'fields'  => array( 'ID' ),
 							'exclude' => $users,
 						)
 					);
 
+					$blog_users = wp_list_pluck( $blog_users, 'ID' );
+
 					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
 						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' .
-								/* translators: Hidden accessibility text. */
-								__( 'Select a user' ) .
-							'</label>';
-						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
-						$user_list      = '';
-
-						foreach ( $blog_users as $user ) {
-							if ( ! in_array( (int) $user->ID, $users, true ) ) {
-								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
-							}
-						}
-
-						if ( '' === $user_list ) {
-							$user_list = $admin_out;
-						}
-
-						$user_dropdown .= $user_list;
-						$user_dropdown .= "</select>\n";
+
 						?>
 						<ul style="list-style:none;">
 							<li>
@@ -971,7 +954,18 @@ function confirm_delete_users( $users ) {
 							<?php _e( 'Delete all content.' ); ?></label></li>
 							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />
 							<?php _e( 'Attribute all content to:' ); ?></label>
-							<?php echo $user_dropdown; ?></li>
+							<?php
+							wp_dropdown_users(
+								array(
+									'name'    => "blog[$user_id][$key]",
+									'include' => $blog_users,
+									'show'    => 'display_name_with_login',
+								)
+							);
+							?>
+
+
+						</li>
 						</ul>
 						<?php
 					}

From 87143da27fbf2fd70f0ffe08ca2fa3850607eb2d Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 15 Jul 2025 13:55:21 +0200
Subject: [PATCH 11/20] Use required attribute

---
 src/js/_enqueues/admin/common.js | 12 ------------
 src/wp-admin/includes/ms.php     |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index da1487b818191..358948d306cf6 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2354,15 +2354,3 @@ $( function( $ ) {
 	// Expose public methods.
 	return pub;
 })();
-
-
-// Disable Confirm Deletion button until delete or reassignemnt is selected.
-( function( $ ) {
-	var $deleteButton = $( '#confirm-users-deletion' );
-
-	if ( ! $deleteButton.length ) {
-		return;
-	}
-
-	$deleteButton.prop( 'disabled', true );
-}( jQuery ));
diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 237fbe52a3a58..4fa2f83bb98f3 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -942,7 +942,7 @@ function confirm_delete_users( $users ) {
 						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
 
 						?>
-						<ul style="list-style:none;">
+						<ul>
 							<li>
 								<?php
 								/* translators: %s: Link to user's site. */
@@ -950,9 +950,9 @@ function confirm_delete_users( $users ) {
 								?>
 							</li>
 							<?php // TODO: Fix duplicate IDs ?>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" />
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
 							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />
+							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" required />
 							<?php _e( 'Attribute all content to:' ); ?></label>
 							<?php
 							wp_dropdown_users(

From 4e057d0a9961d987ef5daac6d772c670854a8ee6 Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 16 Sep 2025 11:54:51 +0200
Subject: [PATCH 12/20] Refactor user deletion form, improve UI.

---
 src/wp-admin/includes/deprecated.php |  11 +++
 src/wp-admin/includes/ms.php         |  39 +++++---
 src/wp-admin/includes/user.php       |  20 ----
 src/wp-admin/users.php               | 143 ++++++++++++++-------------
 4 files changed, 109 insertions(+), 104 deletions(-)

diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php
index 86524fb897311..929ad012ddb4f 100644
--- a/src/wp-admin/includes/deprecated.php
+++ b/src/wp-admin/includes/deprecated.php
@@ -1589,3 +1589,14 @@ function image_attachment_fields_to_save( $post, $attachment ) {
 
 	return $post;
 }
+
+/**
+ * Was used to add JavaScript to the delete users form.
+ *
+ * @since 3.5.0
+ * @deprecated 6.9.0
+ * @access private
+ */
+function delete_users_add_js() {
+	_deprecated_function( __FUNCTION__, '6.9.0' );
+}
diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 4fa2f83bb98f3..fcc96b5136b18 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -874,7 +874,7 @@ function confirm_delete_users( $users ) {
 		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
 	<?php endif; ?>
 
-	<form action="users.php?action=dodelete" method="post">
+	<form action="users.php?action=dodelete" method="post" class="delete-and-reassign-users-form">
 	<input type="hidden" name="dodelete" />
 	<?php
 	wp_nonce_field( 'ms-users-delete' );
@@ -949,22 +949,31 @@ function confirm_delete_users( $users ) {
 								printf( __( 'Site: %s' ), $user_site );
 								?>
 							</li>
-							<?php // TODO: Fix duplicate IDs ?>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
-							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" required />
-							<?php _e( 'Attribute all content to:' ); ?></label>
-							<?php
-							wp_dropdown_users(
-								array(
-									'name'    => "blog[$user_id][$key]",
-									'include' => $blog_users,
-									'show'    => 'display_name_with_login',
-								)
-							);
-							?>
+							<li>
+								<label>
+									<input type="radio" id="delete_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
+									<?php _e( 'Delete all content.' ); ?>
+								</label>
+							</li>
+							<li>
+								<label>
+									<input type="radio" id="reassign_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" required />
+									<?php _e( 'Attribute all content to:' ); ?>
+								</label>
 
+								<?php
+								wp_dropdown_users(
+									array(
+										'show_option_none' => __( 'Select a user' ),
+										'name'             => "blog[$user_id][$key]",
+										'include'          => $blog_users,
+										'show'             => 'display_name_with_login',
+										'id'               => "reassign_user_{$details->userblog_id}_{$delete_user->ID}",
+									)
+								);
+								?>
 
+							</li>
 						</li>
 						</ul>
 						<?php
diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index 6181a8457f1b8..591e9a35e69ea 100644
--- a/src/wp-admin/includes/user.php
+++ b/src/wp-admin/includes/user.php
@@ -561,26 +561,6 @@ function default_password_nag() {
 	);
 }
 
-/**
- * @since 3.5.0
- * @access private
- */
-function delete_users_add_js() {
-	?>
-<script>
-jQuery( function($) {
-	var submit = $('#submit').prop('disabled', true);
-	$('input[name="delete_option"]').one('change', function() {
-		submit.prop('disabled', false);
-	});
-	$('#reassign_user').focus( function() {
-		$('#delete_option1').prop('checked', true).trigger('change');
-	});
-} );
-</script>
-	<?php
-}
-
 /**
  * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
  *
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index 6f41bacb8c6b8..75b8051371d99 100644
--- a/src/wp-admin/users.php
+++ b/src/wp-admin/users.php
@@ -208,12 +208,12 @@
 				continue;
 			}
 
-			switch ( $_REQUEST['delete_option'] ) {
+			switch ( $_REQUEST['delete_option'][ $id ] ) {
 				case 'delete':
 					wp_delete_user( $id );
 					break;
 				case 'reassign':
-					wp_delete_user( $id, $_REQUEST['reassign_user'] );
+					wp_delete_user( $id, $_REQUEST['reassign_user'][ $id ] );
 					break;
 			}
 
@@ -301,40 +301,9 @@
 			$user_ids = array_diff( $user_ids, array( $current_user->ID ) );
 		}
 
-		/**
-		 * Filters whether the users being deleted have additional content
-		 * associated with them outside of the `post_author` and `link_owner` relationships.
-		 *
-		 * @since 5.2.0
-		 *
-		 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
-		 * @param int[] $user_ids                      Array of IDs for users being deleted.
-		 */
-		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $user_ids );
-
-		if ( $user_ids && ! $users_have_content ) {
-			if ( $wpdb->get_var(
-				"SELECT ID FROM {$wpdb->posts}
-				WHERE post_author IN( " . implode( ',', $user_ids ) . ' )
-				LIMIT 1'
-			) ) {
-				$users_have_content = true;
-			} elseif ( $wpdb->get_var(
-				"SELECT link_id FROM {$wpdb->links}
-				WHERE link_owner IN( " . implode( ',', $user_ids ) . ' )
-				LIMIT 1'
-			) ) {
-				$users_have_content = true;
-			}
-		}
-
-		if ( $users_have_content ) {
-			add_action( 'admin_head', 'delete_users_add_js' );
-		}
-
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 		?>
-		<form method="post" name="updateusers" id="updateusers">
+		<form method="post" name="updateusers" id="updateusers" class="delete-and-reassign-users-form">
 		<?php wp_nonce_field( 'delete-users' ); ?>
 		<?php echo $referer; ?>
 
@@ -361,6 +330,7 @@
 		<ul>
 		<?php
 		$go_delete = 0;
+		$users_have_content = false;
 
 		foreach ( $all_user_ids as $id ) {
 			$user = get_userdata( $id );
@@ -386,6 +356,76 @@
 					$id,
 					$user->user_login
 				);
+
+				/**
+				 * Filters whether the users being deleted have additional content
+				 * associated with them outside of the `post_author` and `link_owner` relationships.
+				 *
+				 * @since 5.2.0
+				 *
+				 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
+				 * @param int[] $user_ids                      Array of IDs for users being deleted.
+				 */
+				$user_has_content = (bool) apply_filters( 'users_have_additional_content', false, array( $id ) );
+
+				if ( ! $user_has_content ) {
+					if ( $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT ID FROM {$wpdb->posts}
+							WHERE post_author = %d
+							LIMIT 1",
+							$id
+						)
+					) ) {
+						$user_has_content = true;
+					} elseif ( $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT link_id FROM {$wpdb->links}
+							WHERE link_owner = %d
+							LIMIT 1",
+							$id
+						)
+					) ) {
+						$user_has_content = true;
+					}
+				}
+
+				if ( ! $user_has_content ) {
+					?>
+					<input type="hidden" name="delete_option[<?php echo esc_attr( $id ); ?>]" value="delete" required />
+					<p><legend><?php _e( 'This user does not have any content.' ); ?></legend></p>
+					<?php
+				} else {
+					?>
+					<fieldset>
+					<p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+
+					<ul style="list-style:none;">
+						<li>
+							<input type="radio" id="delete_option_<?php echo esc_attr( $id ); ?>" name="delete_option[<?php echo esc_attr( $id ); ?>]" value="delete" required />
+							<label for="delete_option_<?php echo esc_attr( $id ); ?>"><?php _e( 'Delete all content.' ); ?></label>
+						</li>
+						<li>
+							<input type="radio" id="reassign_option_<?php echo esc_attr( $id ); ?>" name="delete_option[<?php echo esc_attr( $id ); ?>]" value="reassign" required />
+							<label for="reassign_option_<?php echo esc_attr( $id ); ?>"><?php _e( 'Attribute all content to:' ); ?></label>
+							<?php
+							wp_dropdown_users(
+								array(
+									'show_option_none' => __( 'Select a user' ),
+									'name'             => 'reassign_user[' . $id . ']',
+									'id'               => 'reassign_user_' . $id,
+									'exclude'          => $user_ids,
+									'show'             => 'display_name_with_login',
+								)
+							);
+							?>
+						</li>
+					</ul>
+					</fieldset>
+					<?php
+					$users_have_content = true;
+				}
+
 				echo "</li>\n";
 
 				++$go_delete;
@@ -396,41 +436,6 @@
 
 		<?php
 		if ( $go_delete ) :
-
-			if ( ! $users_have_content ) :
-				?>
-				<input type="hidden" name="delete_option" value="delete" />
-			<?php else : ?>
-				<fieldset>
-				<?php if ( 1 === $go_delete ) : ?>
-					<p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-				<?php else : ?>
-					<p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
-				<?php endif; ?>
-
-				<ul style="list-style:none;">
-					<li>
-						<input type="radio" id="delete_option0" name="delete_option" value="delete" />
-						<label for="delete_option0"><?php _e( 'Delete all content.' ); ?></label>
-					</li>
-					<li>
-						<input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-						<label for="delete_option1"><?php _e( 'Attribute all content to:' ); ?></label>
-						<?php
-						wp_dropdown_users(
-							array(
-								'name'    => 'reassign_user',
-								'exclude' => $user_ids,
-								'show'    => 'display_name_with_login',
-							)
-						);
-						?>
-					</li>
-				</ul>
-				</fieldset>
-				<?php
-			endif;
-
 			/**
 			 * Fires at the end of the delete users form prior to the confirm button.
 			 *

From afe1012918b059feba3bb0e52f8939e31d5b80c1 Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 14 Oct 2025 11:00:07 +0200
Subject: [PATCH 13/20] Implement logic to disable submit button until all
 radio buttons are checked in user deletion form

---
 src/js/_enqueues/admin/common.js | 55 ++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 358948d306cf6..1ce6a08ed93fb 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2354,3 +2354,58 @@ $( function( $ ) {
 	// Expose public methods.
 	return pub;
 })();
+
+/**
+ * Disable the submit button until all users radio buttons are checked.
+ */
+(function($){
+	const usersForm = document.querySelector( '.users-php .delete-and-reassign-users-form' );
+
+	// Check if the form contains any radio buttons.
+	if ( ! usersForm.querySelector( 'input[type="radio"]' ) ) {
+		return;
+	}
+
+	const submitBtn = usersForm.querySelector( 'input[type="submit"]' );
+
+	// Disable the submit button until all users radio buttons are checked.
+	submitBtn.disabled = true;
+
+	// Listen for changes on any radio input in the form.
+	usersForm.addEventListener('change', function(e) {
+ 		if ( ! usersForm.checkValidity() ) {
+			submitBtn.disabled = true;
+			return;
+		}
+
+		// Check all radio groups for validity.
+		let allValid = true;
+		const radioGroups = usersForm.querySelectorAll( 'fieldset' );
+		radioGroups.forEach( function( fieldset ) {
+			const radios = fieldset.querySelectorAll( 'input[type="radio"]' );
+			let checkedRadio = null;
+			radios.forEach( function( radio ) {
+				if ( radio.checked ) {
+					checkedRadio = radio;
+				}
+			});
+
+			if ( checkedRadio && checkedRadio.value === 'reassign' ) {
+				const select = fieldset.querySelector( 'select' );
+				if ( select && select.value === '-1' ) {
+					allValid = false;
+				}
+			}
+		});
+
+		submitBtn.disabled = !allValid;
+	});
+
+	usersForm.querySelectorAll( 'select' ).forEach( function( selectElement ) {
+		selectElement.addEventListener( 'change', function( e ) {
+			const radio = e.target.closest( 'li' ).querySelector( 'input[type="radio"]' );
+			radio.checked = e.target.value !== '-1';
+		});
+	});
+
+})(jQuery);

From 9d5385d96781fe418d5634d39d288d74d34b7db3 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 11 Nov 2025 09:12:09 +0100
Subject: [PATCH 14/20] Check if form exists

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/js/_enqueues/admin/common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 1ce6a08ed93fb..d384bda7fb4da 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2361,8 +2361,8 @@ $( function( $ ) {
 (function($){
 	const usersForm = document.querySelector( '.users-php .delete-and-reassign-users-form' );
 
-	// Check if the form contains any radio buttons.
-	if ( ! usersForm.querySelector( 'input[type="radio"]' ) ) {
+	// Check if the form exists and contains any radio buttons.
+	if ( ! usersForm || ! usersForm.querySelector( 'input[type="radio"]' ) ) {
 		return;
 	}
 

From 0add334feedfced8538d8767915840463942bfad Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 11 Nov 2025 09:15:28 +0100
Subject: [PATCH 15/20] Refactor IIFE in common.js

Refactor the IIFE structure and remove unnecessary code.
---
 src/js/_enqueues/admin/common.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index d384bda7fb4da..ee1e5d5a576f2 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2357,8 +2357,10 @@ $( function( $ ) {
 
 /**
  * Disable the submit button until all users radio buttons are checked.
+ *
+ * @since 7.0.0
  */
-(function($){
+(function(){
 	const usersForm = document.querySelector( '.users-php .delete-and-reassign-users-form' );
 
 	// Check if the form exists and contains any radio buttons.
@@ -2407,5 +2409,4 @@ $( function( $ ) {
 			radio.checked = e.target.value !== '-1';
 		});
 	});
-
-})(jQuery);
+})();

From 4fbfce24c25746e6b422a078e78a1f1eeb431e9c Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 11 Nov 2025 10:22:35 +0100
Subject: [PATCH 16/20] Removed unused function parameter

---
 src/js/_enqueues/admin/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index ee1e5d5a576f2..4c8c0386b2a02 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2374,7 +2374,7 @@ $( function( $ ) {
 	submitBtn.disabled = true;
 
 	// Listen for changes on any radio input in the form.
-	usersForm.addEventListener('change', function(e) {
+	usersForm.addEventListener('change', function() {
  		if ( ! usersForm.checkValidity() ) {
 			submitBtn.disabled = true;
 			return;

From 271ca0ab19732f9a1688e66db14027efe8bb1784 Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 11 Nov 2025 11:37:34 +0100
Subject: [PATCH 17/20] Update radio group selection in form validation

---
 src/js/_enqueues/admin/common.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 4c8c0386b2a02..62af86c5d363b 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -2382,9 +2382,9 @@ $( function( $ ) {
 
 		// Check all radio groups for validity.
 		let allValid = true;
-		const radioGroups = usersForm.querySelectorAll( 'fieldset' );
-		radioGroups.forEach( function( fieldset ) {
-			const radios = fieldset.querySelectorAll( 'input[type="radio"]' );
+		const radioGroups = usersForm.querySelectorAll( 'fieldset ul' );
+		radioGroups.forEach( function( radioGroup ) {
+			const radios = radioGroup.querySelectorAll( 'input[type="radio"]' );
 			let checkedRadio = null;
 			radios.forEach( function( radio ) {
 				if ( radio.checked ) {
@@ -2393,7 +2393,7 @@ $( function( $ ) {
 			});
 
 			if ( checkedRadio && checkedRadio.value === 'reassign' ) {
-				const select = fieldset.querySelector( 'select' );
+				const select = radioGroup.querySelector( 'select' );
 				if ( select && select.value === '-1' ) {
 					allValid = false;
 				}

From c3e3a892586bfd34db268ef2fe703e51fc023eee Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 11 Nov 2025 11:53:48 +0100
Subject: [PATCH 18/20] When deleting users, check if user has content,
 otherwise hide attribution selection.

---
 src/wp-admin/includes/ms.php | 114 +++++++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 33 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index fcc96b5136b18..10fab7bcfded2 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -860,6 +860,8 @@ function _thickbox_path_admin_subfolder() {
  * @return bool
  */
 function confirm_delete_users( $users ) {
+	global $wpdb;
+
 	$current_user = wp_get_current_user();
 	if ( ! is_array( $users ) || empty( $users ) ) {
 		return false;
@@ -906,7 +908,6 @@ function confirm_delete_users( $users ) {
 				);
 			}
 
-			// TODO: Check if user has content.
 			?>
 			<tr>
 				<th scope="row"><?php echo $delete_user->user_login; ?>
@@ -940,43 +941,90 @@ function confirm_delete_users( $users ) {
 
 					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
 						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-
-						?>
-						<ul>
-							<li>
+						switch_to_blog( $details->userblog_id );
+						/**
+						 * Filters whether the users being deleted have additional content
+						 * associated with them outside of the `post_author` and `link_owner` relationships.
+						 *
+						 * @since 5.2.0
+						 *
+						 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
+						 * @param int[] $user_ids                      Array of IDs for users being deleted.
+						 */
+						$user_has_content = (bool) apply_filters( 'users_have_additional_content', false, array( $delete_user->ID ) );
+
+						if ( ! $user_has_content ) {
+							if ( $wpdb->get_var(
+								$wpdb->prepare(
+									"SELECT ID FROM {$wpdb->posts}
+									WHERE post_author = %d
+									LIMIT 1",
+									$delete_user->ID
+								)
+							) ) {
+								$user_has_content = true;
+							} elseif ( $wpdb->get_var(
+								$wpdb->prepare(
+									"SELECT link_id FROM {$wpdb->links}
+									WHERE link_owner = %d
+									LIMIT 1",
+									$delete_user->ID
+								)
+							) ) {
+								$user_has_content = true;
+							}
+						}
+						restore_current_blog();
+
+						if ( ! $user_has_content ) {
+							?>
+							<p>
+							<?php
+							/* translators: %s: Link to user's site. */
+							printf( __( 'Site: %s' ), $user_site );
+							?>
+							</p>
+							<input type="hidden" id="delete_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
+							<p><?php _e( 'This user does not have any content.' ); ?></p>
+							<?php
+						} else {
+							?>
+							<p>
 								<?php
 								/* translators: %s: Link to user's site. */
 								printf( __( 'Site: %s' ), $user_site );
 								?>
+							</p>
+							<ul>
+								<li>
+									<label>
+										<input type="radio" id="delete_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
+										<?php _e( 'Delete all content.' ); ?>
+									</label>
+								</li>
+								<li>
+									<label>
+										<input type="radio" id="reassign_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" required />
+										<?php _e( 'Attribute all content to:' ); ?>
+									</label>
+
+									<?php
+									wp_dropdown_users(
+										array(
+											'show_option_none' => __( 'Select a user' ),
+											'name'             => "blog[$user_id][$key]",
+											'include'          => $blog_users,
+											'show'             => 'display_name_with_login',
+											'id'               => "reassign_user_{$details->userblog_id}_{$delete_user->ID}",
+										)
+									);
+									?>
+
+								</li>
 							</li>
-							<li>
-								<label>
-									<input type="radio" id="delete_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" required />
-									<?php _e( 'Delete all content.' ); ?>
-								</label>
-							</li>
-							<li>
-								<label>
-									<input type="radio" id="reassign_option_<?php echo esc_attr( $details->userblog_id . '_' . $delete_user->ID ); ?>" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" required />
-									<?php _e( 'Attribute all content to:' ); ?>
-								</label>
-
-								<?php
-								wp_dropdown_users(
-									array(
-										'show_option_none' => __( 'Select a user' ),
-										'name'             => "blog[$user_id][$key]",
-										'include'          => $blog_users,
-										'show'             => 'display_name_with_login',
-										'id'               => "reassign_user_{$details->userblog_id}_{$delete_user->ID}",
-									)
-								);
-								?>
-
-							</li>
-						</li>
-						</ul>
-						<?php
+							</ul>
+							<?php
+						}
 					}
 				}
 				echo '</fieldset></td></tr>';

From a2798e88617bf778e43bc88d9e22c332495b5bbd Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 11 Nov 2025 11:56:14 +0100
Subject: [PATCH 19/20] Remove duplicate filter documentation

---
 src/wp-admin/includes/ms.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 10fab7bcfded2..33e5c2df8bb33 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -942,15 +942,7 @@ function confirm_delete_users( $users ) {
 					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
 						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
 						switch_to_blog( $details->userblog_id );
-						/**
-						 * Filters whether the users being deleted have additional content
-						 * associated with them outside of the `post_author` and `link_owner` relationships.
-						 *
-						 * @since 5.2.0
-						 *
-						 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
-						 * @param int[] $user_ids                      Array of IDs for users being deleted.
-						 */
+						/** This filter is documented in wp-admin/users.php *
 						$user_has_content = (bool) apply_filters( 'users_have_additional_content', false, array( $delete_user->ID ) );
 
 						if ( ! $user_has_content ) {

From ef2fc0fa25a5e376614a576f7581120567e1160b Mon Sep 17 00:00:00 2001
From: Stefan Pasch <stefan.pasch@gmail.com>
Date: Tue, 11 Nov 2025 12:02:51 +0100
Subject: [PATCH 20/20] Fix: added missing comment closing tag

---
 src/wp-admin/includes/ms.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 33e5c2df8bb33..7a2969e5cd28c 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -940,9 +940,9 @@ function confirm_delete_users( $users ) {
 					$blog_users = wp_list_pluck( $blog_users, 'ID' );
 
 					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
-						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
+						$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
 						switch_to_blog( $details->userblog_id );
-						/** This filter is documented in wp-admin/users.php *
+						/* This filter is documented in wp-admin/users.php */
 						$user_has_content = (bool) apply_filters( 'users_have_additional_content', false, array( $delete_user->ID ) );
 
 						if ( ! $user_has_content ) {