Ticket #42766: 42766.3.diff

src/wp-admin/includes/user.php

@@ -45 +45 @@
 
         $pass1 = $pass2 = '';
         if ( isset( $_POST['pass1'] ) ) {
-                $pass1 = $_POST['pass1'];
+                $pass1 = trim( $_POST['pass1'] );
         }
         if ( isset( $_POST['pass2'] ) ) {
-                $pass2 = $_POST['pass2'];
+                $pass2 = trim( $_POST['pass2'] );
         }
 
         if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {

tests/phpunit/tests/user.php

@@ -1362 +1362 @@
          * Checks that calling edit_user() with no password returns an error when adding, and doesn't when updating.
          *
          * @ticket 35715
+         * @ticket 42766
          */
         function test_edit_user_blank_pw() {
                 $_POST                 = $_GET = $_REQUEST = array();
@@ -1398 +1399 @@
                 $this->assertInternalType( 'int', $user_id );
                 $this->assertEquals( 'nickname_updated', $user->nickname );
 
+                // Check not to change an old password if a new password contains only spaces. Ticket #42766
+                $user           = get_user_by( 'ID', $user_id );
+                $old_pass       = $user->user_pass;
+                $_POST['pass1'] = $_POST['pass2'] = '  ';
+
+                $user_id = edit_user( $user_id );
+                $user    = get_user_by( 'ID', $user_id );
+
+                $this->assertInternalType( 'int', $user_id );
+                $this->assertEquals( $old_pass, $user->user_pass );
+
                 // Check updating user with missing second password.
                 $_POST['nickname'] = 'nickname_updated2';
                 $_POST['pass1']    = 'blank_pass2';