Ticket #1626: 1626.patch

wp-includes/pluggable.php

@@ -230 +230 @@
 }
 endif;
 
+if ( !function_exists('get_user_by_nicename') ) :
+/**
+ * get_user_by_nicename() - Retrieve user info by nicename
+ *
+ * @since 2.5
+ *
+ * @param string $email User's nicename
+ * @return bool|object False on failure, User DB row object
+ */
+function get_user_by_nicename($nicename) {
+        global $wpdb;
+
+        $user_id = wp_cache_get($nicename, 'usernicename');
+
+        if ( '0' === $user_id )
+                return false;
+
+        $user = false;
+        if ( false !== $user_id )
+                $user = wp_cache_get($user_id, 'users');
+
+        if ( false !== $user )
+                return $user;
+
+        if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_nicename = %s", $nicename)) ) {
+                wp_cache_add($nicename, 0, 'useremail');
+                return false;
+        }
+
+        _fill_user($user);
+
+        return $user;
+}
+endif;
+
+
 if ( !function_exists( 'wp_mail' ) ) :
 /**
  * wp_mail() - Function to send mail, similar to PHP's mail

wp-includes/registration.php

@@ -6 +6 @@
  */
 
 /**
- * username_exists() - Checks whether the given username exists.
+ * username_exists() - Checks whether the given username exists and that it's nicename is unique
  *
  * @since 2.0.0
  *
  * @param string $username Username.
  * @return null|int The user's ID on success, and null on failure.
  */
+
 function username_exists( $username ) {
-        if ( $user = get_userdatabylogin( $username ) ) {
+        $user_nicename = sanitize_title($username);
+        $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
+        if ( $user = get_userdatabylogin( $username ) ) { 
                 return $user->ID;
+        } elseif ($user = get_user_by_nicename($user_nicename)) {
+                        return $user->ID;                       
         } else {
                 return null;
         }