WordPress.org

Make WordPress Core

Ticket #22107: 22107.2.patch

File 22107.2.patch, 1.8 KB (added by SergeyBiryukov, 5 years ago)
  • wp-admin/user-new.php

     
    113113        } else {
    114114                // Adding a new user to this blog
    115115                $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
    116                 unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
    117116                if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
    118117                        $add_user_errors = $user_details[ 'errors' ];
    119118                } else {
  • wp-includes/ms-functions.php

     
    497497                        $wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
    498498                else
    499499                        $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
    500 
    501                 if ( $signup->active == 0 && $signup->user_email == $user_email )
    502                         $errors->add('user_email_used', __('username and email used'));
    503500        }
    504501
    505502        $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
  • wp-signup.php

     
    136136        <?php } ?>
    137137        <input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
    138138        <?php
    139         if ( $errmsg = $errors->get_error_message('generic') ) {
    140                 echo '<p class="error">' . $errmsg . '</p>';
    141         }
    142139        do_action( 'signup_extra_fields', $errors );
    143140}
    144141