Remove unused error string. props pavelevap. fixes #22107.

git-svn-id: http://core.svn.wordpress.org/trunk@23412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Feb 14, 2013 · 08269aa · 08269aa
1 parent 4e46d00
commit 08269aa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
@@ -113,7 +113,6 @@ function admin_created_user_subject( $text ) {
 	} 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 {

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
@@ -497,9 +497,6 @@ function wpmu_validate_user_signup($user_name, $user_email) {
 			$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) );