Changeset 13031

Timestamp:

08/04/2021 08:29:17 PM (3 years ago)

Author:

imath

Message:

Settings: Make sure changing pwd from the General Screen encrypts it

Using a WP_User object to set the password to update was misleading WordPress wp_update_user() function. The new password was interpreted as the current password and was not encrypted.

Passing a regular array to the wp_update_user() function avoids the risk of messing with WP User object cache.

Props mandro

See #8539 (branch 9.0)

File:

• branches/9.0/src/bp-settings/actions/general.php (modified) (5 diffs)

branches/9.0/src/bp-settings/actions/general.php

@@ -59 +59 @@
     if ( ( is_super_admin() ) || ( !empty( $_POST['pwd'] ) && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
 
-        $update_user = get_userdata( bp_displayed_user_id() );
+        $update_user = array(
+            'ID' => (int) bp_displayed_user_id(),
+        );
 
         /* Email Change Attempt ******************************************/
 
-        if ( !empty( $_POST['email'] ) ) {
+        if ( ! empty( $_POST['email'] ) ) {
 
             // What is missing from the profile page vs signup -
@@ -71 +73 @@
 
             // User is changing email address.
-            if ( $old_user_email != $user_email ) {
+            if ( $old_user_email !== $user_email ) {
 
                 // Run some tests on the email address.
@@ -115 +117 @@
                     // We mark that the change has taken place so as to ensure a
                     // success message, even though verification is still required.
-                    $_POST['email'] = $update_user->user_email;
                     $email_changed = true;
                 }
@@ -139 +140 @@
                 // Password change attempt is successful.
                 if ( ( ! empty( $_POST['pwd'] ) && wp_unslash( $_POST['pwd'] ) !== $pass ) || is_super_admin() )  {
-                    $update_user->user_pass = $_POST['pass1'];
-                    $pass_error             = false;
-                    $pass_changed           = true;
+                    $update_user['user_pass'] = $_POST['pass1'];
+                    $pass_error               = false;
+                    $pass_changed             = true;
 
                 // The new password is the same as the current password.
@@ -158 +159 @@
         }
 
-        // The structure of the $update_user object changed in WP 3.3, but
-        // wp_update_user() still expects the old format.
-        if ( isset( $update_user->data ) && is_object( $update_user->data ) ) {
-            $update_user = $update_user->data;
-            $update_user = get_object_vars( $update_user );
-
-            // Unset the password field to prevent it from emptying out the
-            // user's user_pass field in the database.
-            // @see wp_update_user().
-            if ( false === $pass_changed ) {
-                unset( $update_user['user_pass'] );
-            }
+        // Unset the password field to prevent it from emptying out the
+        // user's user_pass field in the database.
+        if ( false === $pass_changed ) {
+            unset( $update_user['user_pass'] );
         }