Ticket #29880: 29880.diff

src/wp-includes/user.php

@@ -1687 +1687 @@
                 $update = true;
                 $old_user_data = WP_User::get_data_by( 'id', $ID );
                 // hashed in wp_update_user(), plaintext if called directly
-                $user_pass = $userdata['user_pass'];
+                $user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass;
         } else {
                 $update = false;
                 // Hash the password

tests/phpunit/tests/user.php

@@ -669 +669 @@
 
                 $this->assertSame( $user->user_nicename, $updated_user->user_nicename );
         }
+
+        /**
+         * @ticket 29880
+         */
+        function test_wp_insert_user() {
+                $user_details = array(
+                        'user_login' => rand_str(),
+                        'user_pass' => 'password',
+                        'user_email' => rand_str() . '@example.com',
+                );
+                $id1 = wp_insert_user( $user_details );
+                $this->assertEquals( $id1, email_exists( $user_details['user_email'] ) );
+
+                // Check that providing an empty password doesn't remove a user's password.
+                // See ticket #29880
+                $user_details['ID'] = $id1;
+                $user_details['user_pass'] = '';
+                $id1 = wp_insert_user( $user_details );
+                $user = WP_User::get_data_by( 'id', $id1 );
+                $this->assertNotEmpty( $user->user_pass );
+        }
+
 }