From 08269aa6b0dda1d135d8a727571c62c0a95cd0f2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 14 Feb 2013 05:36:28 +0000 Subject: [PATCH] Remove unused error string. props pavelevap. fixes #22107. git-svn-id: http://core.svn.wordpress.org/trunk@23412 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/user-new.php | 1 - wp-includes/ms-functions.php | 3 --- 2 files changed, 4 deletions(-) diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index f9616a2c85..c834273550 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -113,7 +113,6 @@ Please click the following link to confirm the invite: } 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 index 6ea6ea847b..090bda505e 100644 --- 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) );