Changeset 44784

Timestamp:

02/28/2019 10:57:47 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Users: Revert [44780] pending test failure investigation.

See #45845.

File:

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

trunk/src/wp-includes/user.php

@@ -2321 +2321 @@
     }
 
-    $user = get_user_by( 'login', $login );
-
-    if ( ! $user ) {
+    $row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
+    if ( ! $row ) {
         return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
     }
@@ -2341 +2340 @@
     $expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
 
-    if ( false !== strpos( $user->user_activation_key, ':' ) ) {
-        list( $pass_request_time, $pass_key ) = explode( ':', $user->user_activation_key, 2 );
+    if ( false !== strpos( $row->user_activation_key, ':' ) ) {
+        list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 );
         $expiration_time                      = $pass_request_time + $expiration_duration;
     } else {
-        $pass_key        = $user->user_activation_key;
+        $pass_key        = $row->user_activation_key;
         $expiration_time = false;
     }
@@ -2356 +2355 @@
 
     if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) {
-        return $user;
+        return get_userdata( $row->ID );
     } elseif ( $hash_is_correct && $expiration_time ) {
         // Key has an expiration time that's passed
@@ -2362 +2361 @@
     }
 
-    if ( hash_equals( $user->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
+    if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
         $return  = new WP_Error( 'expired_key', __( 'Invalid key' ) );
-        $user_id = $user->ID;
+        $user_id = $row->ID;
 
         /**