WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 [https://mu.trac.wordpress.org/changeset/641 mu:641], [https://mu.trac.wordpress.org/changeset/1529 mu:1529], [12722], [16294].

Props akshat2802, mukesh27, aristath, SergeyBiryukov.
Fixes #62012.
Built from https://develop.svn.wordpress.org/trunk@58999


git-svn-id: http://core.svn.wordpress.org/trunk@58395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-09-09 10:17:15 +00:00
parent 11f8d8ec2b
commit 911d37b465
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/user-new.php
View File

@ -34,6 +34,7 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' === $_REQUEST['action'] ) {
$user_details = null; $user_details = null;
$user_email = wp_unslash( $_REQUEST['email'] ); $user_email = wp_unslash( $_REQUEST['email'] );
if ( str_contains( $user_email, '@' ) ) { if ( str_contains( $user_email, '@' ) ) {
$user_details = get_user_by( 'email', $user_email ); $user_details = get_user_by( 'email', $user_email );
} else { } else {
@ -63,7 +64,8 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' === $_REQUEST['action'] ) {
$redirect = 'user-new.php'; $redirect = 'user-new.php';
$username = $user_details->user_login; $username = $user_details->user_login;
$user_id = $user_details->ID; $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' ); $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' );
} else { } else {
if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) { if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
@ -178,6 +180,7 @@ Please click the following link to confirm the invite:
$redirect = add_query_arg( array( 'update' => 'add' ), 'user-new.php' ); $redirect = add_query_arg( array( 'update' => 'add' ), 'user-new.php' );
} }
} }
wp_redirect( $redirect ); wp_redirect( $redirect );
die(); die();
} elseif ( isset( $_REQUEST['action'] ) && 'createuser' === $_REQUEST['action'] ) { } elseif ( isset( $_REQUEST['action'] ) && 'createuser' === $_REQUEST['action'] ) {
@ -202,6 +205,7 @@ Please click the following link to confirm the invite:
} else { } else {
$redirect = add_query_arg( 'update', 'add', 'user-new.php' ); $redirect = add_query_arg( 'update', 'add', 'user-new.php' );
} }
wp_redirect( $redirect ); wp_redirect( $redirect );
die(); die();
} }
@ -209,15 +213,18 @@ Please click the following link to confirm the invite:
// Adding a new user to this site. // Adding a new user to this site.
$new_user_email = wp_unslash( $_REQUEST['email'] ); $new_user_email = wp_unslash( $_REQUEST['email'] );
$user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_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() ) { if ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) {
$add_user_errors = $user_details['errors']; $add_user_errors = $user_details['errors'];
} else { } else {
/** This filter is documented in wp-includes/user.php */ /** 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 ) ); $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' ) ) { if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email. add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email.
add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email. add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email.
} }
wpmu_signup_user( wpmu_signup_user(
$new_user_login, $new_user_login,
$new_user_email, $new_user_email,
@ -226,6 +233,7 @@ Please click the following link to confirm the invite:
'new_role' => $_REQUEST['role'], 'new_role' => $_REQUEST['role'],
) )
); );
if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) { 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 ) ); $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 ) );
$new_user = wpmu_activate_signup( $key ); $new_user = wpmu_activate_signup( $key );
@ -245,6 +253,7 @@ Please click the following link to confirm the invite:
} else { } else {
$redirect = add_query_arg( array( 'update' => 'newuserconfirmation' ), 'user-new.php' ); $redirect = add_query_arg( array( 'update' => 'newuserconfirmation' ), 'user-new.php' );
} }
wp_redirect( $redirect ); wp_redirect( $redirect );
die(); die();
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.7-alpha-58998'; $wp_version = '6.7-alpha-58999';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.