Ticket #43601: for43601.diff

src/wp-admin/network/site-new.php

@@ -120 +120 @@
                 }
                 $password = wp_generate_password( 12, false );
                 $user_id  = wpmu_create_user( $domain, $password, $email );
-                if ( false === $user_id ) {
-                        wp_die( __( 'There was an error creating the user.' ) );
+
+                $is_user_error = is_wp_error( $user_id );
+                if ( $is_user_error || ! $user_id ) {
+                        $error_message = __( 'There was an error creating the user.' );
+                        if ( $is_user_error ) {
+                                $error_message .= ' ' . $user_id->get_error_message();
+                        }
+                        wp_die( $error_message );
                 }
 
                 /**

src/wp-admin/network/site-users.php

@@ -68 +68 @@
                                 $password = wp_generate_password( 12, false );
                                 $user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
-                                if ( false === $user_id ) {
+                                if ( is_wp_error( $user_id ) || ! $user_id ) {
                                         $update = 'err_new_dup';
                                 } else {
                                         $result = add_user_to_blog( $id, $user_id, $_POST['new_role'] );

src/wp-admin/network/user-new.php

@@ -50 +50 @@
                 $password = wp_generate_password( 12, false );
                 $user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
 
-                if ( ! $user_id ) {
-                        $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+                $is_user_error = is_wp_error( $user_id );
+                if ( $is_user_error || ! $user_id ) {
+                        $error_message = __( 'Cannot add user.' );
+                        if ( $is_user_error ) {
+                                $error_message .= ' ' . $user_id->get_error_message();
+                        }
+                        $add_user_errors = new WP_Error( 'add_user_fail', $error_message );
                 } else {
                         /**
                          * Fires after a new user has been created via the network user-new.php page.

src/wp-includes/ms-functions.php

@@ -1120 +1120 @@
                 $user_already_exists = true;
         }
 
-        if ( ! $user_id ) {
-                return new WP_Error( 'create_user', __( 'Could not create user' ), $signup );
+        $is_user_error = is_wp_error( $user_id );
+        if ( $is_user_error || ! $user_id ) {
+                $error_message = __( 'Could not create user.' );
+                if ( $is_user_error ) {
+                        $error_message .= ' ' . $user_id->get_error_message();
+                }
+                return new WP_Error( 'create_user', $error_message, $signup );
         }
 
         $now = current_time( 'mysql', true );
@@ -1221 +1226 @@
 
         $user_id = wp_create_user( $user_name, $password, $email );
         if ( is_wp_error( $user_id ) ) {
-                return false;
+                return $user_id->get_error_message();
         }
 
         // Newly created users have no roles or caps until they are added to a blog.

src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -487 +487 @@
                 if ( is_multisite() ) {
                         $user_id = wpmu_create_user( $user->user_login, $user->user_pass, $user->user_email );
 
-                        if ( ! $user_id ) {
-                                return new WP_Error( 'rest_user_create', __( 'Error creating new user.' ), array( 'status' => 500 ) );
+                        $is_user_error = is_wp_error( $user_id );
+                        if ( $is_user_error || ! $user_id ) {
+                                $error_message = __( 'Error creating new user.' );
+                                if ( $is_user_error ) {
+                                        $error_message .= ' ' . $user_id->get_error_message();
+                                }
+                                return new WP_Error( 'rest_user_create', $error_message, array( 'status' => 500 ) );
                         }
 
                         $user->ID = $user_id;