<!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>[53336] trunk: Editor: Sets 'paged' query arg only when there are comments: `build_comment_query_vars_from_block()`.</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/53336">53336</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/53336","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-03 14:31:12 +0000 (Tue, 03 May 2022)</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'>Editor: Sets 'paged' query arg only when there are comments: `build_comment_query_vars_from_block()`.
A SQL syntax error happened when a post has no comments and "Break comments into pages" is checked in Settings > Discussion. The fix sets the `'paged'` query arg only when there are comments. When there are no comments, `WP_Comment_Query` sets the default `'paged'` value to `1`.
Props bernhard-reiter, luisherranz, czapla, cbravobernal, davidbaumwald, hellofromTonya.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53142">[53142]</a>, <a href="https://core.trac.wordpress.org/changeset/53138">[53138]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/55658">#55658</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunktestsphpunittestsblocksrenderCommentTemplatephp">trunk/tests/phpunit/tests/blocks/renderCommentTemplate.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 2022-05-02 16:42:03 UTC (rev 53335)
+++ trunk/src/wp-includes/blocks.php 2022-05-03 14:31:12 UTC (rev 53336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1325,7 +1325,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'oldest' === $default_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args['paged'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'newest' === $default_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_args['paged'] = (int) ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_num_pages = (int) ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
+ if ( 0 !== $max_num_pages ) {
+ $comment_args['paged'] = $max_num_pages;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the `cpage` query var to ensure the previous and next pagination links are correct
</span><span class="cx" style="display: block; padding: 0 10px"> // when inheriting the Discussion Settings.
</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 2022-05-02 16:42:03 UTC (rev 53335)
+++ trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php 2022-05-03 14:31:12 UTC (rev 53336)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +138,62 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test that if pagination is set to display the last page by default (i.e. newest comments),
+ * the query is set to look for page 1 (rather than page 0, which would cause an error).
+ *
+ * Regression: https://github.com/WordPress/gutenberg/issues/40758.
+ *
+ * @ticket 55658
+ * @covers ::build_comment_query_vars_from_block
+ */
+ function test_build_comment_query_vars_from_block_pagination_with_no_comments() {
+ $comments_per_page = get_option( 'comments_per_page' );
+ $default_comments_page = get_option( 'default_comments_page' );
+
+ update_option( 'comments_per_page', 50 );
+ update_option( 'previous_default_page', 'newest' );
+
+ $post_without_comments = self::factory()->post->create_and_get(
+ array(
+ 'post_type' => 'post',
+ 'post_status' => 'publish',
+ 'post_name' => 'fluffycat',
+ 'post_title' => 'Fluffy Cat',
+ 'post_content' => 'Fluffy Cat content',
+ 'post_excerpt' => 'Fluffy Cat',
+ )
+ );
+
+ $parsed_blocks = parse_blocks(
+ '<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
+ );
+
+ $block = new WP_Block(
+ $parsed_blocks[0],
+ array(
+ 'postId' => $post_without_comments->ID,
+ )
+ );
+
+ $this->assertSameSetsWithIndex(
+ array(
+ 'orderby' => 'comment_date_gmt',
+ 'order' => 'ASC',
+ 'status' => 'approve',
+ 'no_found_rows' => false,
+ 'post_id' => $post_without_comments->ID,
+ 'hierarchical' => 'threaded',
+ 'number' => 50,
+ ),
+ build_comment_query_vars_from_block( $block )
+ );
+
+ update_option( 'comments_per_page', $comments_per_page );
+ update_option( 'default_comments_page', $default_comments_page );
+ }
+
+
+ /**
</ins><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><span class="cx" style="display: block; padding: 0 10px"> * In order to do that, it should exist a query var 'cpage' set with the $comment_args['paged'] value.
</span></span></pre>
</div>
</div>
</body>
</html>