Changeset 58261

Timestamp:

05/30/2024 09:17:58 PM (2 months ago)

Author:

SergeyBiryukov

Message:

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

Follow-up to [2895], [3481], [5627], ​mu:1581, ​mu:1612, [12603], [18504], [33771], [41653], [41654], [45708], [51399].

Props dhruvang21, aristath, poena, afercia, SergeyBiryukov.
Fixes #61315. See #60700.

File:

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

trunk/src/wp-includes/user.php

@@ -1103 +1103 @@
     $site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
 
-    if ( isset( $keys[ $base_capabilities_key ] ) && 1 == $blog_id ) {
+    if ( isset( $keys[ $base_capabilities_key ] ) && 1 == $blog_id ) {
         return true;
     }
@@ -1254 +1254 @@
 
     if ( 'time' === $strategy ) {
-        if ( is_multisite() && get_current_blog_id() != $site_id ) {
+        if ( is_multisite() && get_current_blog_id() != $site_id ) {
             switch_to_blog( $site_id );
             $avail_roles = wp_roles()->get_names();
@@ -2014 +2014 @@
 function validate_username( $username ) {
     $sanitized = sanitize_user( $username, true );
-    $valid     = ( $sanitized == $username && ! empty( $sanitized ) );
+    $valid     = ( $sanitized == $username && ! empty( $sanitized ) );
 
     /**
@@ -2491 +2491 @@
         do_action( 'profile_update', $user_id, $old_user_data, $userdata );
 
-        if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
-            if ( 1 == $userdata['spam'] ) {
+        if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
+            if ( == $userdata['spam'] ) {
                 /**
                  * Fires after the user is marked as a SPAM user.
@@ -2749 +2749 @@
     // Update the cookies if the password changed.
     $current_user = wp_get_current_user();
-    if ( $current_user->ID == $user_id ) {
+    if ( $current_user->ID == $user_id ) {
         if ( isset( $plaintext_pass ) ) {
             wp_clear_auth_cookie();
@@ -2760 +2760 @@
             /** This filter is documented in wp-includes/pluggable.php */
             $default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $user_id, false );
-            $remember            = false;
+
+            $remember = false;
+
             if ( false !== $logged_in_cookie && ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life ) {
                 $remember = true;
@@ -3564 +3566 @@
     $prefix = $wpdb->get_blog_prefix( $site_id );
 
-    if ( is_multisite() && get_current_blog_id() != $site_id ) {
+    if ( is_multisite() && get_current_blog_id() != $site_id ) {
         switch_to_blog( $site_id );
         $role_names = wp_roles()->get_names();
@@ -3673 +3675 @@
     }
 
-    if ( $current_user->ID != $_POST['user_id'] ) {
+    if ( $current_user->ID != $_POST['user_id'] ) {
         return false;
     }
 
-    if ( $current_user->user_email != $_POST['email'] ) {
+    if ( $current_user->user_email != $_POST['email'] ) {
         if ( ! is_email( $_POST['email'] ) ) {
             $errors->add(