Changeset 45806

Timestamp:

08/15/2019 01:05:39 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/users.php (modified) (5 diffs)

trunk/src/wp-admin/users.php

@@ -235 +235 @@
                 }
 
+                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
@@ -246 +251 @@
                 $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;
@@ -272 +277 @@
                 <?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 : ?>
@@ -281 +286 @@
                 <?php
                 $go_delete = 0;
-                foreach ( $userids as $id ) {
+                foreach ( $all_userids as $id ) {
                         $user = get_userdata( $id );
                         if ( $id == $current_user->ID ) {
@@ -315 +320 @@
                                         array(
                                                 'name'    => 'reassign_user',
-                                                'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+                                                'exclude' => $userids,
                                                 'show'    => 'display_name_with_login',
                                         )