Changeset 46989

Timestamp:

12/18/2019 02:24:05 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Users: When creating the first user on installation, populate the Website profile field with the site URL.

Skip setting the field if the user already exists, which is the case when the user tables are being shared among multiple sites.

Props EFAREM, eclare, darrenlambert, zachflauaus, viralsampat.
Fixes #35778.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -83 +83 @@
         $user_password  = trim( $user_password );
         $email_password = false;
+        $user_created   = false;
+
         if ( ! $user_id && empty( $user_password ) ) {
             $user_password = wp_generate_password( 12, false );
@@ -89 +91 @@
             update_user_option( $user_id, 'default_password_nag', true, true );
             $email_password = true;
+            $user_created   = true;
         } elseif ( ! $user_id ) {
-            // Password has been provided
-            $message = '<em>' . __( 'Your chosen password.' ) . '</em>';
-            $user_id = wp_create_user( $user_name, $user_password, $user_email );
+            // Password has been provided.
+            $message      = '<em>' . __( 'Your chosen password.' ) . '</em>';
+            $user_id      = wp_create_user( $user_name, $user_password, $user_email );
+            $user_created = true;
         } else {
             $message = __( 'User already exists. Password inherited.' );
@@ -99 +103 @@
         $user = new WP_User( $user_id );
         $user->set_role( 'administrator' );
+
+        if ( $user_created ) {
+            $user->user_url = $guessurl;
+            wp_update_user( $user );
+        }
 
         wp_install_defaults( $user_id );