Changeset 7031 for branches/2.6/src/includes/users/functions.php

Timestamp:

12/13/2019 09:25:05 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Users: move _new_email from options to usermeta.

This commit brings bbPress up-to-date with how WordPress tracks changes to email addresses. It includes a small bit of styling to add emphasis to the email address inside the standard notice wrapper.

See #3306. For 2.6.4, branches/2.6.

File:

• branches/2.6/src/includes/users/functions.php (modified) (7 diffs)

branches/2.6/src/includes/users/functions.php ¶

@@ -229 +229 @@
 
         // Update the option
-        $key    = $user_id . '_new_email';
-        $hash   = md5( $_POST['email'] . time() . mt_rand() );
         $option = array(
-            'hash'     => $hash,
-            'newemail' => $_POST['email']
+            'hash'     => md5( $_POST['email'] . time() . wp_rand() ),
+            'newemail' => $_POST['email'],
         );
-        update_option( $key, $option );
+        update_user_meta( $user_id, '_new_email', $option );
 
         // Attempt to notify the user of email address change
@@ -315 +313 @@
     // Get the displayed user ID & option key
     $user_id     = bbp_get_displayed_user_id();
-    $key         = $user_id . '_new_email';
+    $key         = '_new_email';
     $redirect_to = bbp_get_user_profile_edit_url( $user_id );
 
@@ -322 +320 @@
 
         // Check for email address change option
-        $new_email = get_option( $key );
+        $new_email = get_user_meta( $user_id, $key, true );
 
         // Redirect if *no* email address change exists
@@ -331 +329 @@
         // Cleanup & redirect if *invalid* email address change exists
         if ( empty( $new_email['hash'] ) || empty( $new_email['newemail'] ) ) {
-            delete_option( $key );
+            delete_user_meta( $user_id, $key );
 
             bbp_redirect( $redirect_to );
@@ -341 +339 @@
             // Does another user have this email address already?
             if ( email_exists( $new_email['newemail'] ) ) {
-                delete_option( $key );
+                delete_user_meta( $user_id, $key );
 
                 bbp_add_error( 'bbp_user_email_taken', __( '<strong>ERROR</strong>: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) );
@@ -370 +368 @@
                     }
 
-                    delete_option( $key );
+                    delete_user_meta( $user_id, $key );
 
                     bbp_redirect( add_query_arg( array( 'updated' => 'true' ), $redirect_to ) );
@@ -378 +376 @@
 
     // Delete new email address from user options
-    } elseif ( ! empty( $_GET['dismiss'] ) && ( $key === $_GET['dismiss'] ) ) {
-        if ( ! bbp_verify_nonce_request( "dismiss-{$key}" ) ) {
+    } elseif ( ! empty( $_GET['dismiss'] ) && ( "{$user_id}{$key}" === $_GET['dismiss'] ) ) {
+        if ( ! bbp_verify_nonce_request( "dismiss-{$user_id}{$key}" ) ) {
             bbp_add_error( 'bbp_dismiss_new_email_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
             return;
         }
 
-        delete_option( $key );
+        delete_user_meta( $user_id, $key );
         bbp_redirect( $redirect_to );
     }