Ticket #33800: 33800_final.diff

src/wp-admin/includes/ms.php

@@ -185 +185 @@
 function wpmu_delete_user( $id ) {
         global $wpdb;
 
+        if ( ! is_numeric( $id ) )
+                return false;
+
         $id = (int) $id;
         $user = new WP_User( $id );
 

src/wp-admin/includes/user.php

@@ -273 +273 @@
 function wp_delete_user( $id, $reassign = null ) {
         global $wpdb;
 
+        if ( ! is_numeric( $id ) )
+                return false;
+
         $id = (int) $id;
         $user = new WP_User( $id );
 

tests/phpunit/tests/user.php

@@ -516 +516 @@
         }
 
         /**
+         * @ticket 33800
+         */
+        function test_delete_user_error_check() {
+                // Create a test user.
+                $user_id = $this->factory->user->create( array(
+                        'user_email' => 'ilovewordpress@example.com',
+                ) );
+                // set data for new user with same email id
+                $userdata = array(
+                        'user_login' => 'login_name',
+                        'user_email' => 'ilovewordpress@example.com',
+                        'user_pass'  => 'mysecretkey'  // When creating an user, `user_pass` is expected.
+                );
+                // create new user with email already exists.
+                $id = wp_insert_user( $userdata );
+                // delete that user but $id is actually WP_Error so wp_delete_user should return false.
+                $is_deleted = wp_delete_user( $id );
+                // check if wp_delete_user returned false
+                $this->assertFalse( $is_deleted );
+        }
+
+        /**
          * @ticket 13317
          */
         function test_get_userdata() {