Changeset 12778 for trunk/wp-includes/registration.php

Timestamp:

01/20/2010 09:58:13 PM (16 years ago)

Author:

ryan

Message:

Add email and login dupe checking down into wp_insert_user(). Tidy up user-new.php. see #11644

File:

• trunk/wp-includes/registration.php (modified) (2 diffs)

trunk/wp-includes/registration.php

@@ -123 +123 @@
     $user_login = trim($user_login);
 
-    if ( empty($user_login) ) {
+    if ( empty($user_login) )
         return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
-    }
+
+    if ( !$update && username_exists( $user_login ) )
+        return new WP_Error('existing_user_login', __('This username is already registered.') );
 
     if ( empty($user_nicename) )
@@ -138 +140 @@
         $user_email = '';
     $user_email = apply_filters('pre_user_email', $user_email);
+
+    if ( !$update && email_exists($user_email) )
+        return new WP_Error('existing_user_email', __('This email address is already registered.') );
 
     if ( empty($display_name) )