Changeset 7031 for branches/2.6/src/includes/users/template.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/template.php (modified) (2 diffs)

branches/2.6/src/includes/users/template.php

@@ -1388 +1388 @@
     // Check for pending email address change
     $user_id   = bbp_get_displayed_user_id();
-    $key       = $user_id . '_new_email';
-    $new_email = get_option( $key );
+    $key       = '_new_email';
+    $new_email = get_user_meta( $user_id, $key, true );
 
     // Bail if no pending email address change
@@ -1398 +1398 @@
     // Build the nonced URL to dismiss the pending change
     $user_url = bbp_get_user_profile_edit_url( $user_id );
-    $nonce    = "dismiss-{$key}";
+    $nonce    = "dismiss-{$user_id}{$key}";
     $args     = array(
         'action'  => 'bbp-update-user-email',
-        'dismiss' => $key
+        'dismiss' => "{$user_id}{$key}"
     );