Ticket #44921: 44921.diff

wp-includes/user.php

@@ -1710 +1710 @@
 
         $meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
 
-        $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 ) );
+        $user_args = array(
+                'blog_id'       => 0,
+                'fields'        => 'ID',
+                'nicename'      => $user_nicename,
+                'number'        => 1,
+                'login__not_in' => array( $user_login ),
+        );
 
+        $user_nicename_check = get_users( $user_args );
+
         if ( $user_nicename_check ) {
                 $suffix = 2;
                 while ( $user_nicename_check ) {
                         // user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.
-                        $base_length         = 49 - mb_strlen( $suffix );
-                        $alt_user_nicename   = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
-                        $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 ) );
+                        $base_length                = 49 - mb_strlen( $suffix );
+                        $alt_user_nicename          = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
+                        $user_args['login__not_in'] = array( $alt_user_nicename );
+                        $user_nicename_check        = get_users( $user_args );
                         $suffix++;
                 }
                 $user_nicename = $alt_user_nicename;