Changeset 23412

Timestamp:

02/14/2013 05:36:28 AM (12 years ago)

Author:

SergeyBiryukov

Message:

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

Location:

trunk

Files:

• wp-admin/user-new.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/user-new.php

@@ -114 +114 @@
         // 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' ];

trunk/wp-includes/ms-functions.php

@@ -498 +498 @@
         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'));
     }