WordPress.org

Make WordPress Core

Ticket #23358: 23358.5.diff

File 23358.5.diff, 5.1 KB (added by ocean90, 6 years ago)
  • src/wp-admin/includes/ms.php

     
    342342
    343343                if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
    344344                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
    345                         delete_option( $current_user->ID . '_new_email' );
     345                        delete_user_meta( $current_user->ID, '_new_email' );
    346346                        return;
    347347                }
    348348
     
    351351                                'hash' => $hash,
    352352                                'newemail' => $_POST['email']
    353353                                );
    354                 update_option( $current_user->ID . '_new_email', $new_user_email );
     354                update_user_meta( $current_user->ID, '_new_email', $new_user_email );
    355355
    356356                /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
    357357                $email_text = __( 'Howdy ###USERNAME###,
  • src/wp-admin/includes/upgrade.php

     
    16681668 * @ignore
    16691669 * @since 4.5.0
    16701670 *
    1671  * @global int $wp_current_db_version
     1671 * @global int  $wp_current_db_version
     1672 * @global wpdb $wpdb
    16721673 */
    16731674function upgrade_450() {
    1674         global $wp_current_db_version;
    1675         if ( $wp_current_db_version < 36180 )
     1675        global $wp_current_db_version, $wpdb;
     1676
     1677        if ( $wp_current_db_version < 36180 ) {
    16761678                wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
     1679        }
     1680
     1681        // Remove unused email change options, moved to user meta.
     1682        if ( $wp_current_db_version < 36584 && is_multisite() ) {
     1683                $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '[0-9]+_new_email'" );
     1684        }
    16771685}
    16781686
    16791687/**
  • src/wp-admin/user-edit.php

     
    8282
    8383// Execute confirmed email change. See send_confirmation_on_profile_email().
    8484if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
    85         $new_email = get_option( $current_user->ID . '_new_email' );
    86         if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
     85        $new_email = get_user_meta( $current_user->ID . '_new_email', true );
     86        if ( $new_email && $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
    8787                $user = new stdClass;
    8888                $user->ID = $current_user->ID;
    8989                $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
    90                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
     90                if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
    9191                        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
     92                }
    9293                wp_update_user( $user );
    93                 delete_option( $current_user->ID . '_new_email' );
     94                delete_user_meta( $current_user->ID, '_new_email' );
    9495                wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
    9596                die();
     97        } else {
     98                wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
    9699        }
    97100} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
    98         delete_option( $current_user->ID . '_new_email' );
     101        delete_user_meta( $current_user->ID, '_new_email' );
    99102        wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
    100103        die();
    101104}
     
    181184        <?php endif; ?>
    182185</div>
    183186<?php endif; ?>
     187<?php if ( isset( $_GET['error'] ) ) : ?>
     188<div id="message" class="notice notice-error">
     189        <?php if ( 'new-email' == $_GET['error'] ) : ?>
     190        <p><?php _e( 'Error while saving the new email. Please try again.' ); ?></p>
     191        <?php endif; ?>
     192</div>
     193<?php endif; ?>
    184194<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
    185195<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
    186196<?php endif; ?>
     
    383393        <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
    384394        <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
    385395        <?php
    386         $new_email = get_option( $current_user->ID . '_new_email' );
     396        $new_email = get_user_meta( $current_user->ID . '_new_email', true );
    387397        if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
    388398        <div class="updated inline">
    389399        <p><?php
  • src/wp-includes/version.php

     
    1111 *
    1212 * @global int $wp_db_version
    1313 */
    14 $wp_db_version = 36180;
     14$wp_db_version = 36584;
    1515
    1616/**
    1717 * Holds the TinyMCE version