Editor: Update build_comment_query_vars_from_block from Gutenberg

gziolo · gziolo · commit cab6fec683eb · 2022-04-11T16:33:51.000Z
Follow-up for [53138]. See #55505. git-svn-id: https://develop.svn.wordpress.org/trunk@53142 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
@@ -1392,24 +1392,25 @@ function build_comment_query_vars_from_block( $block ) {
 		$comment_args['hierarchical'] = false;
 	}
 
-	$per_page     = get_option( 'comments_per_page' );
-	$default_page = get_option( 'default_comments_page' );
-
-	if ( $per_page > 0 ) {
-		$comment_args['number'] = $per_page;
-
-		$page = (int) get_query_var( 'cpage' );
-		if ( $page ) {
-			$comment_args['paged'] = $page;
-		} elseif ( 'oldest' === $default_page ) {
-			$comment_args['paged'] = 1;
-		} elseif ( 'newest' === $default_page ) {
-			$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 ( get_option( 'page_comments' ) === '1' || get_option( 'page_comments' ) === true ) {
+		$per_page     = get_option( 'comments_per_page' );
+		$default_page = get_option( 'default_comments_page' );
+		if ( $per_page > 0 ) {
+			$comment_args['number'] = $per_page;
+
+			$page = (int) get_query_var( 'cpage' );
+			if ( $page ) {
+				$comment_args['paged'] = $page;
+			} elseif ( 'oldest' === $default_page ) {
+				$comment_args['paged'] = 1;
+			} elseif ( 'newest' === $default_page ) {
+				$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'] );
+			}
 		}
 	}
 
