Ticket #22107: 22107.2.patch

wp-admin/user-new.php

@@ -113 +113 @@
         } else {
                 // Adding a new user to this blog
                 $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
-                unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
                 if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
                         $add_user_errors = $user_details[ 'errors' ];
                 } else {

wp-includes/ms-functions.php

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

wp-signup.php

@@ -136 +136 @@
         <?php } ?>
         <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.)') ?>
         <?php
-        if ( $errmsg = $errors->get_error_message('generic') ) {
-                echo '<p class="error">' . $errmsg . '</p>';
-        }
         do_action( 'signup_extra_fields', $errors );
 }