Ticket #23358: 23358.4.diff

src/wp-admin/includes/ms.php

@@ -329 +329 @@
         if ( $current_user->ID != $_POST['user_id'] )
                 return false;
 
+        _user_new_email_compat( $current_user->ID );
+
         if ( $current_user->user_email != $_POST['email'] ) {
                 if ( !is_email( $_POST['email'] ) ) {
                         $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
@@ -337 +339 @@
 
                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
                         $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
-                        delete_option( $current_user->ID . '_new_email' );
+                        delete_user_meta( $current_user->ID, '_new_email' );
                         return;
                 }
 
@@ -400 +402 @@
  * @since 3.0.0
  */
 function new_user_email_admin_notice() {
-        if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) )
-                echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+        if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) ) {
+                _user_new_email_compat( get_current_user_id() );
+                if ( $email = get_user_meta( get_current_user_id(), '_new_email', true ) )
+                        echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+        }
 }
 
 /**

src/wp-admin/includes/user.php

@@ -516 +516 @@
 Please click the following link to activate your user account:
 %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
 }
+
+/**
+ * Pending e-mail changes used to be stored in options. This helps transition to user meta.
+ *
+ * @access private
+ * @since 3.7.0
+ */
+function _user_new_email_compat( $user_id ) {
+        if ( get_option( $user_id . '_new_email', false ) ) {
+                update_user_meta( $user_id, '_new_email', get_option( $user_id . '_new_email' ) );
+                delete_option( $user_id . '_new_email' );
+        }
+}
+ No newline at end of file

src/wp-admin/user-edit.php

@@ -82 +82 @@
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
 if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-        $new_email = get_option( $current_user->ID . '_new_email' );
+        _user_new_email_compat( $current_user->ID );
+        $new_email = get_user_meta( $current_user->ID, '_new_email', true );
         if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
                 $user = new stdClass;
                 $user->ID = $current_user->ID;
@@ -90 +91 @@
                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
                         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
                 wp_update_user( $user );
-                delete_option( $current_user->ID . '_new_email' );
+                delete_user_meta( $current_user->ID, '_new_email' );
                 wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
                 die();
         }
 } elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
-        delete_option( $current_user->ID . '_new_email' );
+        _user_new_email_compat( $current_user->ID );
+        delete_user_meta( $current_user->ID, '_new_email' );
         wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
         die();
 }
@@ -383 +385 @@
         <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
         <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
         <?php
-        $new_email = get_option( $current_user->ID . '_new_email' );
+        _user_new_email_compat( $current_user->ID );
+        $new_email = get_user_meta( $current_user->ID, '_new_email', true );
         if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
         <div class="updated inline">
         <p><?php