WordPress.org

Make WordPress Core

Ticket #22107: 22107.patch

File 22107.patch, 1.2 KB (added by SergeyBiryukov, 6 years ago)

Refreshed to remove an empty line

  • 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

     
    490490                        $wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
    491491                else
    492492                        $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
    493 
    494                 if ( $signup->active == 0 && $signup->user_email == $user_email )
    495                         $errors->add('user_email_used', __('username and email used'));
    496493        }
    497494
    498495        $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );