Ticket #23358: 23358.5.diff

src/wp-admin/includes/ms.php

@@ -342 +342 @@
 
                 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;
                 }
 
@@ -351 +351 @@
                                 'hash' => $hash,
                                 'newemail' => $_POST['email']
                                 );
-                update_option( $current_user->ID . '_new_email', $new_user_email );
+                update_user_meta( $current_user->ID, '_new_email', $new_user_email );
 
                 /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
                 $email_text = __( 'Howdy ###USERNAME###,

src/wp-admin/includes/upgrade.php

@@ -1668 +1668 @@
  * @ignore
  * @since 4.5.0
  *
- * @global int $wp_current_db_version
+ * @global int  $wp_current_db_version
+ * @global wpdb $wpdb
  */
 function upgrade_450() {
-        global $wp_current_db_version;
-        if ( $wp_current_db_version < 36180 )
+        global $wp_current_db_version, $wpdb;
+
+        if ( $wp_current_db_version < 36180 ) {
                 wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+        }
+
+        // Remove unused email change options, moved to user meta.
+        if ( $wp_current_db_version < 36584 && is_multisite() ) {
+                $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '[0-9]+_new_email'" );
+        }
 }
 
 /**

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' );
-        if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+        $new_email = get_user_meta( $current_user->ID . '_new_email', true );
+        if ( $new_email && $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
                 $user = new stdClass;
                 $user->ID = $current_user->ID;
                 $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-                if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
+                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();
+        } else {
+                wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
         }
 } elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
-        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();
 }
@@ -181 +184 @@
         <?php endif; ?>
 </div>
 <?php endif; ?>
+<?php if ( isset( $_GET['error'] ) ) : ?>
+<div id="message" class="notice notice-error">
+        <?php if ( 'new-email' == $_GET['error'] ) : ?>
+        <p><?php _e( 'Error while saving the new email. Please try again.' ); ?></p>
+        <?php endif; ?>
+</div>
+<?php endif; ?>
 <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 <div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
 <?php endif; ?>
@@ -383 +393 @@
         <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' );
+        $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

src/wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 36180;
+$wp_db_version = 36584;
 
 /**
  * Holds the TinyMCE version