Changeset 37059 for trunk/src/wp-admin/includes/user.php

Timestamp:

03/22/2016 11:06:29 PM (9 years ago)

Author:

ocean90

Message:

Users: In edit_user() check for a blank password when adding a user.

Props wesleye, gitlost, adamsilverstein.
Fixes #35715.

File:

• trunk/src/wp-admin/includes/user.php (modified) (2 diffs)

trunk/src/wp-admin/includes/user.php

@@ -114 +114 @@
     }
 
-    /* checking the password has been typed twice */
     /**
      * Fires before the password and confirm password fields are checked for congruity.
@@ -126 +125 @@
     do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
 
-    /* Check for "\" in password */
-    if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) )
+    // Check for blank password when adding a user.
+    if ( ! $update && empty( $pass1 ) ) {
+        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+    }
+
+    // Check for "\" in password.
+    if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) {
         $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
-
-    /* checking the password has been typed twice the same */
-    if ( $pass1 != $pass2 )
+    }
+
+    // Checking the password has been typed twice the same.
+    if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
         $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+    }
 
     if ( !empty( $pass1 ) )