Ticket #37818: 37818.patch

src/wp-includes/user.php

@@ -1346 +1346 @@
  * @since 2.0.0
  * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
  *              methods for new installs. See wp_get_user_contact_methods().
- * @since 4.7.0 The `import_id` field was added to suggest the User ID.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -1381 +1380 @@
  *     @type string|bool $show_admin_bar_front Whether to display the Admin Bar for the user on the
  *                                             site's front end. Default true.
  *     @type string      $role                 User's role.
- *     @type int         $import_id            Suggested Uer ID, use it if not already present.
  * }
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
@@ -1598 +1596 @@
 
         $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));
 
-        $import_id = empty( $userdata['import_id'] ) ? 0 : $userdata['import_id'];
-
         if ( $user_nicename_check ) {
                 $suffix = 2;
                 while ($user_nicename_check) {
@@ -1622 +1618 @@
                 $wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
                 $user_id = (int) $ID;
         } else {
-                // If there is a suggested ID, use it if not already present.
-                if ( ! empty( $import_id ) ) {
-                        $import_id = (int) $import_id;
-                        if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE ID = %d", $import_id) ) ) {
-                                $data['ID'] = $import_id;
-                        }
-                }
                 $wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
                 $user_id = (int) $wpdb->insert_id;
         }