Refactor requested changes

WordPress · Mar 15, 2022 · a5953bc · a5953bc
1 parent 2d6b1f6
commit a5953bc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/compat/experimental/blocks.php b/lib/compat/experimental/blocks.php
@@ -60,11 +60,13 @@ function build_comment_query_vars_from_block( $block ) {
 			} elseif ( 'oldest' === $default_page ) {
 				$comment_args['paged'] = 1;
 			} elseif ( 'newest' === $default_page ) {
-				$comment_args['paged'] = ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
+				$comment_args['paged'] = (int) ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
+			}
+			// 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'] );
 			}
-		}
-		if ( empty($page) && $comment_args['paged'] ) {
-			set_query_var( 'cpage', $comment_args['paged'] );
 		}
 
 		return $comment_args;