<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58261] trunk/src/wp-includes/user.php: Coding Standards: Use strict comparison in `wp-includes/user.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58261">58261</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58261","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-30 21:17:58 +0000 (Thu, 30 May 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use strict comparison in `wp-includes/user.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/2895">[2895]</a>, <a href="https://core.trac.wordpress.org/changeset/3481">[3481]</a>, <a href="https://core.trac.wordpress.org/changeset/5627">[5627]</a>, [https://mu.trac.wordpress.org/changeset/1581 mu:1581], [https://mu.trac.wordpress.org/changeset/1612 mu:1612], <a href="https://core.trac.wordpress.org/changeset/12603">[12603]</a>, <a href="https://core.trac.wordpress.org/changeset/18504">[18504]</a>, <a href="https://core.trac.wordpress.org/changeset/33771">[33771]</a>, <a href="https://core.trac.wordpress.org/changeset/41653">[41653]</a>, <a href="https://core.trac.wordpress.org/changeset/41654">[41654]</a>, <a href="https://core.trac.wordpress.org/changeset/45708">[45708]</a>, <a href="https://core.trac.wordpress.org/changeset/51399">[51399]</a>.
Props dhruvang21, aristath, poena, afercia, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/61315">#61315</a>. See <a href="https://core.trac.wordpress.org/ticket/60700">#60700</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2024-05-30 18:23:59 UTC (rev 58260)
+++ trunk/src/wp-includes/user.php 2024-05-30 21:17:58 UTC (rev 58261)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1102,7 +1102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base_capabilities_key = $wpdb->base_prefix . 'capabilities';
</span><span class="cx" style="display: block; padding: 0 10px"> $site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $keys[ $base_capabilities_key ] ) && 1 == $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $keys[ $base_capabilities_key ] ) && 1 === $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,7 +1253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'time' === $strategy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && get_current_blog_id() != $site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() !== $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $avail_roles = wp_roles()->get_names();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2013,7 +2013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function validate_username( $username ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sanitized = sanitize_user( $username, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $valid = ( $sanitized == $username && ! empty( $sanitized ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $valid = ( $sanitized === $username && ! empty( $sanitized ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the provided username is valid.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2490,8 +2490,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'profile_update', $user_id, $old_user_data, $userdata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
- if ( 1 == $userdata['spam'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $userdata['spam'] ) && $userdata['spam'] !== $old_user_data->spam ) {
+ if ( '1' === $userdata['spam'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the user is marked as a SPAM user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2748,7 +2748,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the cookies if the password changed.
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_get_current_user();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_user->ID == $user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $current_user->ID === $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plaintext_pass ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clear_auth_cookie();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2759,7 +2759,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $logged_in_cookie = wp_parse_auth_cookie( '', 'logged_in' );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/pluggable.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $user_id, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $remember = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $remember = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $logged_in_cookie && ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $remember = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3563,7 +3565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && get_current_blog_id() != $site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() !== $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $role_names = wp_roles()->get_names();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3672,11 +3674,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_user->ID != $_POST['user_id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $current_user->ID !== (int) $_POST['user_id'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_user->user_email != $_POST['email'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $current_user->user_email !== $_POST['email'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_email( $_POST['email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email',
</span></span></pre>
</div>
</div>
</body>
</html>