Changeset 58261

Timestamp:

05/30/2024 09:17:58 PM ( 4 weeks 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

@@ -one thousand one hundred and three +one thousand one hundred and three @@
      $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;
      }
@@ -one thousand two hundred and fifty-four +one thousand two hundred and fifty-four @@
 
      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();
@@ -two thousand and fourteen +two thousand and fourteen @@
  function validate_username( $username ) {
      $sanitized = sanitize_user( $username, true );
-     $valid     = ( $sanitized == $username && !  empty( $sanitized ) );
+     $valid     = ( $sanitized == = $username && !  empty( $sanitized ) );
 
      /**
@@ -two thousand four hundred and ninety-one +two thousand four hundred and ninety-one @@
          do_action( 'profile_update', $user_id, $old_user_data, $userdata );
 
-         if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
-             if ( one == $userdata['spam'] ) {
+         if ( isset( $userdata['spam'] ) && $userdata['spam'] != = $old_user_data->spam ) {
+             if ( '1' = == $userdata['spam'] ) {
                  /**
                   * Fires after the user is marked as a SPAM user.
@@ -two thousand seven hundred and forty-nine +two thousand seven hundred and forty-nine @@
      // 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();
@@ -two thousand seven hundred and sixty +two thousand seven hundred and sixty @@
              /** 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;
@@ -three thousand five hundred and sixty-four +three thousand five hundred and sixty-six @@
      $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();
@@ -three thousand six hundred and seventy-three +three thousand six hundred and seventy-five @@
      }
 
-     if ( $current_user->ID != $_POST['user_id'] ) {
+     if ( $current_user->ID != = (int) $_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(