From ab0b860db9662b9fae1abe8ba4588da0a6f84a4e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 15 Aug 2019 13:06:55 +0000
Subject: [PATCH] Users: When deleting users, exclude the current user from the
 content existence check.

The current user cannot be deleted, so the check is redundant in that context and should only be done for other users.

Props mt8.biz, SergeyBiryukov.
Fixes #47851.
Built from https://develop.svn.wordpress.org/trunk@45806


git-svn-id: http://core.svn.wordpress.org/trunk@45617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/users.php      | 13 +++++++++----
 wp-includes/version.php |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-admin/users.php b/wp-admin/users.php
index 31f2bd9398..6ca1eb7af9 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -234,6 +234,11 @@ switch ( $wp_list_table->current_action() ) {
 			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 		}
 
+		if ( in_array( $current_user->ID, $userids ) ) {
+			$all_userids = $userids;
+			$userids     = array_diff( $userids, 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.
@@ -245,7 +250,7 @@ switch ( $wp_list_table->current_action() ) {
 		 */
 		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $userids );
 
-		if ( ! $users_have_content ) {
+		if ( $userids && ! $users_have_content ) {
 			if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
 				$users_have_content = true;
 			} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
@@ -271,7 +276,7 @@ switch ( $wp_list_table->current_action() ) {
 	</div>
 		<?php endif; ?>
 
-		<?php if ( 1 == count( $userids ) ) : ?>
+		<?php if ( 1 == count( $all_userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
 		<?php else : ?>
 	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
@@ -280,7 +285,7 @@ switch ( $wp_list_table->current_action() ) {
 <ul>
 		<?php
 		$go_delete = 0;
-		foreach ( $userids as $id ) {
+		foreach ( $all_userids as $id ) {
 			$user = get_userdata( $id );
 			if ( $id == $current_user->ID ) {
 				/* translators: 1: user id, 2: user login */
@@ -314,7 +319,7 @@ switch ( $wp_list_table->current_action() ) {
 				wp_dropdown_users(
 					array(
 						'name'    => 'reassign_user',
-						'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+						'exclude' => $userids,
 						'show'    => 'display_name_with_login',
 					)
 				);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a1d98c3663..de19224470 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45805';
+$wp_version = '5.3-alpha-45806';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.