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

Coding Standards: Use strict comparison in `wp-admin/includes/user.php`. 

Follow-up to [10990], [11162], [11217], [37059].

Props jenilk.
Fixes #57317.
Built from https://develop.svn.wordpress.org/trunk@55592


git-svn-id: http://core.svn.wordpress.org/trunk@55104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-03-25 15:25:26 +00:00
parent 7278aadd72
commit 95a52be05d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/user.php
View File

@ -179,7 +179,7 @@ function edit_user( $user_id = 0 ) {
} }
// Checking the password has been typed twice the same. // Checking the password has been typed twice the same.
if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { if ( ( $update || ! empty( $pass1 ) ) && $pass1 !== $pass2 ) {
$errors->add( 'pass', __( '<strong>Error:</strong> Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); $errors->add( 'pass', __( '<strong>Error:</strong> Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
} }
@ -202,14 +202,14 @@ function edit_user( $user_id = 0 ) {
$errors->add( 'invalid_username', __( '<strong>Error:</strong> Sorry, that username is not allowed.' ) ); $errors->add( 'invalid_username', __( '<strong>Error:</strong> Sorry, that username is not allowed.' ) );
} }
/* checking email address */ // Checking email address.
if ( empty( $user->user_email ) ) { if ( empty( $user->user_email ) ) {
$errors->add( 'empty_email', __( '<strong>Error:</strong> Please enter an email address.' ), array( 'form-field' => 'email' ) ); $errors->add( 'empty_email', __( '<strong>Error:</strong> Please enter an email address.' ), array( 'form-field' => 'email' ) );
} elseif ( ! is_email( $user->user_email ) ) { } elseif ( ! is_email( $user->user_email ) ) {
$errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ), array( 'form-field' => 'email' ) ); $errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ), array( 'form-field' => 'email' ) );
} else { } else {
$owner_id = email_exists( $user->user_email ); $owner_id = email_exists( $user->user_email );
if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { if ( $owner_id && ( ! $update || ( $owner_id !== $user->ID ) ) ) {
$errors->add( 'email_exists', __( '<strong>Error:</strong> This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) ); $errors->add( 'email_exists', __( '<strong>Error:</strong> This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
} }
} }
@ -485,7 +485,7 @@ function default_password_nag_handler( $errors = false ) {
// get_user_setting() = JS-saved UI setting. Else no-js-fallback code. // get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
if ( 'hide' === get_user_setting( 'default_password_nag' ) if ( 'hide' === get_user_setting( 'default_password_nag' )
|| isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag'] || isset( $_GET['default_password_nag'] ) && '0' === $_GET['default_password_nag']
) { ) {
delete_user_setting( 'default_password_nag' ); delete_user_setting( 'default_password_nag' );
update_user_meta( $user_ID, 'default_password_nag', false ); update_user_meta( $user_ID, 'default_password_nag', false );
@ -507,7 +507,7 @@ function default_password_nag_edit_user( $user_ID, $old_data ) {
$new_data = get_userdata( $user_ID ); $new_data = get_userdata( $user_ID );
// Remove the nag if the password has been changed. // Remove the nag if the password has been changed.
if ( $new_data->user_pass != $old_data->user_pass ) { if ( $new_data->user_pass !== $old_data->user_pass ) {
delete_user_setting( 'default_password_nag' ); delete_user_setting( 'default_password_nag' );
update_user_meta( $user_ID, 'default_password_nag', false ); update_user_meta( $user_ID, 'default_password_nag', false );
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.3-alpha-55591'; $wp_version = '6.3-alpha-55592';
/** /**
* 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.