Changeset 58999

Timestamp:

09/09/2024 10:15:24 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Users: Remove obsolete conditional in wp-admin/user-new.php.

Since $username is set to $user_details->user_login, it will never be null in this specific line.

Follow-up to ​mu:641, ​mu:1529, [12722], [16294].

Props akshat2802, mukesh27, aristath, SergeyBiryukov.
Fixes #62012.

File:

• trunk/src/wp-admin/user-new.php (modified) (8 diffs)

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

@@ -35 +35 @@
         $user_details = null;
         $user_email   = wp_unslash( $_REQUEST['email'] );
+
         if ( str_contains( $user_email, '@' ) ) {
                 $user_details = get_user_by( 'email', $user_email );
@@ -64 +65 @@
         $username       = $user_details->user_login;
         $user_id        = $user_details->ID;
-        if ( null != $username && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
+
+        if ( array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
                 $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' );
         } else {
@@ -179 +181 @@
                 }
         }
+
         wp_redirect( $redirect );
         die();
@@ -203 +206 @@
                                 $redirect = add_query_arg( 'update', 'add', 'user-new.php' );
                         }
+
                         wp_redirect( $redirect );
                         die();
@@ -210 +214 @@
                 $new_user_email = wp_unslash( $_REQUEST['email'] );
                 $user_details   = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
+
                 if ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) {
                         $add_user_errors = $user_details['errors'];
@@ -215 +220 @@
                         /** This filter is documented in wp-includes/user.php */
                         $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
+
                         if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
                                 add_filter( 'wpmu_signup_user_notification', '__return_false' );  // Disable confirmation email.
                                 add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email.
                         }
+
                         wpmu_signup_user(
                                 $new_user_login,
@@ -227 +234 @@
                                 )
                         );
+
                         if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
                                 $key      = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
@@ -246 +254 @@
                                 $redirect = add_query_arg( array( 'update' => 'newuserconfirmation' ), 'user-new.php' );
                         }
+
                         wp_redirect( $redirect );
                         die();