Changeset 11331

Timestamp:

05/14/2009 06:55:32 PM (16 years ago)

Author:

ryan

Message:

Use user_login instead of ID to check if user exists when creating unique nicenames. ID isn't available when inserting new users. Props sivel. see #9393

File:

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

trunk/wp-includes/registration.php

@@ -177 +177 @@
         $user_registered = gmdate('Y-m-d H:i:s');
 
-    $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND ID != %d LIMIT 1" , $user_nicename, (int) $ID));
+    $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
 
     if ($user_nicename_check) {
@@ -183 +183 @@
         while ($user_nicename_check) {
             $alt_user_nicename = $user_nicename . "-$suffix";
-            $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND ID != %d LIMIT 1" , $alt_user_nicename, (int) $ID));
+            $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
             $suffix++;
         }