<!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>[59081] trunk: Comments: Pass $page as argument to comments functions</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/59081">59081</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/59081","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-23 12:48:32 +0000 (Mon, 23 Sep 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'>Comments: Pass $page as argument to comments functions
Removes query alteration from `build_comment_query_vars_from_block` by introducing a new way to pass the `$page` as argument to functions handling pagination for the comments.
Props cybr, santosguillamot, bernhard-reiter, gziolo.
Fixes <a href="https://core.trac.wordpress.org/ticket/60806">#60806</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunktestsphpunittestsblocksrenderCommentTemplatephp">trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetNextCommentsLinkphp">trunk/tests/phpunit/tests/link/getNextCommentsLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPreviousCommentsLinkphp">trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksphp"></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/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2024-09-23 12:33:14 UTC (rev 59080)
+++ trunk/src/wp-includes/blocks.php 2024-09-23 12:48:32 UTC (rev 59081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2567,11 +2567,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args['paged'] = $max_num_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">- // Set the `cpage` query var to ensure the previous and next pagination links are correct
- // when inheriting the Discussion Settings.
- if ( 0 === $page && isset( $comment_args['paged'] ) && $comment_args['paged'] > 0 ) {
- set_query_var( 'cpage', $comment_args['paged'] );
- }
</del><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">
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2024-09-23 12:33:14 UTC (rev 59080)
+++ trunk/src/wp-includes/link-template.php 2024-09-23 12:48:32 UTC (rev 59081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3109,14 +3109,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the link to the next comments page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.1
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.7.0 Added the `page` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wp_query WordPress Query object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $label Optional. Label for link text. Default empty.
- * @param int $max_page Optional. Max page. Default 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $label Optional. Label for link text. Default empty.
+ * @param int $max_page Optional. Max page. Default 0.
+ * @param int|null $page Optional. Page number. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|void HTML-formatted link for the next page of comments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_next_comments_link( $label = '', $max_page = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_next_comments_link( $label = '', $max_page = 0, $page = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_singular() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3123,7 +3125,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $page = get_query_var( 'cpage' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_null( $page ) ) {
+ $page = get_query_var( 'cpage' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3180,16 +3184,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the link to the previous comments page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.1
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.7.0 Added the `page` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $label Optional. Label for comments link text. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $label Optional. Label for comments link text. Default empty.
+ * @param int|null $page Optional. Page number. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|void HTML-formatted link for the previous page of comments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_previous_comments_link( $label = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_previous_comments_link( $label = '', $page = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_singular() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $page = get_query_var( 'cpage' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_null( $page ) ) {
+ $page = get_query_var( 'cpage' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (int) $page <= 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksrenderCommentTemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php 2024-09-23 12:33:14 UTC (rev 59080)
+++ trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php 2024-09-23 12:48:32 UTC (rev 59081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,12 +219,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test that both "Older Comments" and "Newer Comments" are displayed in the correct order
</span><span class="cx" style="display: block; padding: 0 10px"> * inside the Comment Query Loop when we enable pagination on Discussion Settings.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In order to do that, it should exist a query var 'cpage' set with the $comment_args['paged'] value.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55505
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 60806
</ins><span class="cx" style="display: block; padding: 0 10px"> * @covers ::build_comment_query_vars_from_block
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_build_comment_query_vars_from_block_sets_cpage_var() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_build_comment_query_vars_from_block_sets_max_num_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This could be any number, we set a fixed one instead of a random for better performance.
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_query_max_num_pages = 5;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = build_comment_query_vars_from_block( $block );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $comment_query_max_num_pages, $actual['paged'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $comment_query_max_num_pages, get_query_var( 'cpage' ) );
</del><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"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetNextCommentsLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link/getNextCommentsLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getNextCommentsLink.php 2024-09-23 12:33:14 UTC (rev 59080)
+++ trunk/tests/phpunit/tests/link/getNextCommentsLink.php 2024-09-23 12:48:32 UTC (rev 59081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,14 +11,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">+ $old_cpage = get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_next_comments_link( 'Next', 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_query_var( 'cpage', $old_cpage );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'cpage=4', $link );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- set_query_var( 'cpage', $cpage );
</del><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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,13 +28,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">+ $old_cpage = get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_next_comments_link( 'Next', 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_query_var( 'cpage', $old_cpage );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'cpage=2', $link );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_query_var( 'cpage', $cpage );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 60806
+ */
+ public function test_page_should_respect_value_of_page_argument() {
+ $p = self::factory()->post->create();
+ $this->go_to( get_permalink( $p ) );
+
+ // Check setting the query var is ignored.
+ $old_cpage = get_query_var( 'cpage' );
+ set_query_var( 'cpage', 2 );
+
+ $link = get_next_comments_link( 'Next', 5, 3 );
+
+ set_query_var( 'cpage', $old_cpage );
+
+ $this->assertStringContainsString( 'cpage=4', $link );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPreviousCommentsLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php 2024-09-23 12:33:14 UTC (rev 59080)
+++ trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php 2024-09-23 12:48:32 UTC (rev 59081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,14 +11,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">+ $old_cpage = get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_previous_comments_link( 'Next' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_previous_comments_link( 'Previous' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_query_var( 'cpage', $old_cpage );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'cpage=2', $link );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- set_query_var( 'cpage', $cpage );
</del><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"> public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,14 +25,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">+ $old_cpage = get_query_var( 'cpage' );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_previous_comments_link( 'Next' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_previous_comments_link( 'Previous' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_query_var( 'cpage', $old_cpage );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Technically, it returns null here.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $link );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_query_var( 'cpage', $cpage );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 60806
+ */
+ public function test_page_should_respect_value_of_page_argument() {
+ $p = self::factory()->post->create();
+ $this->go_to( get_permalink( $p ) );
+
+ // Check setting the query var is ignored.
+ $old_cpage = get_query_var( 'cpage' );
+ set_query_var( 'cpage', 4 );
+
+ $link = get_previous_comments_link( 'Previous', 3 );
+
+ set_query_var( 'cpage', $old_cpage );
+
+ $this->assertStringContainsString( 'cpage=2', $link );
</ins><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>