Changeset 6395

Timestamp:

01/18/2018 06:10:58 AM (7 years ago)

Author:

dd32

Message:

Login: Clear the user cache after updating the activation key, fetch the key directly from the database in the event the cached object doesn't have it temporarily.

Fixes #3390.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• functions-registration.php (modified) (1 diff)
• register-confirm.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -49 +49 @@
     }
     $hashed_activation_key = time() . ':' . $wp_hasher->HashPassword( $activation_key );
-    $bool = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed_activation_key ), array( 'ID' => $user_id ) );
+
+    $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed_activation_key ), array( 'ID' => $user_id ) );
+    clean_user_cache( $user_id );
 
     if ( $user_mailinglist ) {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register-confirm.php

@@ -18 +18 @@
 ) {
     wp_set_current_user( $user->ID );
-    list( $reset_time, $hashed_activation_key ) = explode( ':', $user->user_activation_key, 2 );
+
+    $user_activation_key = $user->user_activation_key;
+    if ( ! $user_activation_key ) {
+        // The activation key may not be in the cached user object, so we'll fetch it manually.
+        $user_activation_key = $wpdb->get_var( $wpdb->prepare( "SELECT user_activation_key FROM {$wpdb->users} WHERE ID = %d", $user->ID ) );
+    }
+
+    list( $reset_time, $hashed_activation_key ) = explode( ':', $user_activation_key, 2 );
 
     if ( empty( $wp_hasher ) ) {