<!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>[59183] trunk/src/wp-includes/comment-template.php: Coding Standards: Use strict comparison in `wp_list_comments()`.</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/59183">59183</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/59183","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-10-06 16:54:10 +0000 (Sun, 06 Oct 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_list_comments()`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/8962">[8962]</a>, <a href="https://core.trac.wordpress.org/changeset/9296">[9296]</a>, <a href="https://core.trac.wordpress.org/changeset/9424">[9424]</a>, <a href="https://core.trac.wordpress.org/changeset/34735">[34735]</a>, <a href="https://core.trac.wordpress.org/changeset/36157">[36157]</a>.
Props deepakrohilla, sabernhardt, aristath, poena, afercia, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/62169">#62169</a>. See <a href="https://core.trac.wordpress.org/ticket/61607">#61607</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2024-10-05 23:23:40 UTC (rev 59182)
+++ trunk/src/wp-includes/comment-template.php 2024-10-06 16:54:10 UTC (rev 59183)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ++$comment_alt;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Alt for top-level comments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $comment_depth ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $comment_depth ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $comment_thread_alt % 2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'thread-odd';
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'thread-alt';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,9 +814,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = $args['page'];
</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 ( '' == $cpage ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $cpage ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $in_comment_loop ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpage = get_query_var( 'cpage' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpage = (int) get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Requires a database hit, so we only do it when we can't figure out from context.
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = get_page_of_comment( $comment->comment_ID, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1605,7 +1605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $overridden_cpage = false;
</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 ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', 'newest' === get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $overridden_cpage = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2291,13 +2291,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * perform a separate comment query and allow Walker_Comment to paginate.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['page'] || $parsed_args['per_page'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_cpage = get_query_var( 'cpage' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_cpage = (int) get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_cpage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
</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">- $current_per_page = get_query_var( 'comments_per_page' );
- if ( $parsed_args['page'] != $current_cpage || $parsed_args['per_page'] != $current_per_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_per_page = (int) get_query_var( 'comments_per_page' );
+ if ( (int) $parsed_args['page'] !== $current_cpage || (int) $parsed_args['per_page'] !== $current_per_page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => get_the_ID(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'comment_date_gmt',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2348,15 +2348,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_query->max_num_comment_pages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page = get_option( 'default_comments_page' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpage = get_query_var( 'cpage' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpage = (int) get_query_var( 'cpage' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'newest' === $default_comments_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['cpage'] = $cpage;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === $cpage ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When first page shows oldest comments, post permalink is the same as
- * the comment permalink.
- */
- } elseif ( 1 == $cpage ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When the first page shows the oldest comments,
+ * post permalink is the same as the comment permalink.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['cpage'] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['cpage'] = $cpage;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2389,14 +2389,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $overridden_cpage ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['page'] = get_query_var( 'cpage' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $threaded = ( -1 != $parsed_args['max_depth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $threaded = ( -1 !== (int) $parsed_args['max_depth'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['page'] = ( 'newest' === get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $parsed_args['per_page'], $threaded ) : 1;
</span><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', $parsed_args['page'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Validation check.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['page'] = (int) $parsed_args['page'];
- if ( 0 == $parsed_args['page'] && 0 != $parsed_args['per_page'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['page'] = (int) $parsed_args['page'];
+ $parsed_args['per_page'] = (int) $parsed_args['per_page'];
+ if ( 0 === $parsed_args['page'] && 0 !== $parsed_args['per_page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['page'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>