From cef4c009cc2e50c94f44908c2780310c2cb67fbf Mon Sep 17 00:00:00 2001 From: Ivan Ottinger <25105483+ivan-ottinger@users.noreply.github.com> Date: Wed, 24 Nov 2021 16:06:50 +0100 Subject: [PATCH 1/3] Fix pagination on empty query This commit adjusts the logic that handles the display of the `Next Page` link in the Query Loop Pagination block. The change makes sure that when there are no query results, the `Next Page` link won't be displayed. This addresses an issue reported at https://github.com/Automattic/wp-calypso/issues/56504 --- packages/block-library/src/query-pagination-next/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/query-pagination-next/index.php b/packages/block-library/src/query-pagination-next/index.php index d091e1c6bbc0fe..5ab39b92f28e59 100644 --- a/packages/block-library/src/query-pagination-next/index.php +++ b/packages/block-library/src/query-pagination-next/index.php @@ -44,7 +44,11 @@ function render_block_core_query_pagination_next( $attributes, $content, $block remove_filter( 'next_posts_link_attributes', $filter_link_attributes ); } elseif ( ! $max_page || $max_page > $page ) { $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); - if ( (int) $custom_query->max_num_pages !== $page ) { + $max_num_pages = (int) $custom_query->max_num_pages; + if ( !$max_num_pages ) { + return ''; + } + if ( $max_num_pages !== $page ) { $content = sprintf( '%3$s', esc_url( add_query_arg( $page_key, $page + 1 ) ), From b01a951d269a105b36e9dcafd8d1e721c1d270f0 Mon Sep 17 00:00:00 2001 From: Ivan Ottinger <25105483+ivan-ottinger@users.noreply.github.com> Date: Wed, 24 Nov 2021 17:05:41 +0100 Subject: [PATCH 2/3] Fix typo (missing space) --- packages/block-library/src/query-pagination-next/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/query-pagination-next/index.php b/packages/block-library/src/query-pagination-next/index.php index 5ab39b92f28e59..7e3c1a6b5ab6c0 100644 --- a/packages/block-library/src/query-pagination-next/index.php +++ b/packages/block-library/src/query-pagination-next/index.php @@ -45,7 +45,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block } elseif ( ! $max_page || $max_page > $page ) { $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); $max_num_pages = (int) $custom_query->max_num_pages; - if ( !$max_num_pages ) { + if ( ! $max_num_pages ) { return ''; } if ( $max_num_pages !== $page ) { From 4cef39f7a53cbd43d1973b05ec9c4dbb9399c0b2 Mon Sep 17 00:00:00 2001 From: Ivan Ottinger <25105483+ivan-ottinger@users.noreply.github.com> Date: Wed, 24 Nov 2021 17:17:02 +0100 Subject: [PATCH 3/3] Fix lint error - add missing space --- packages/block-library/src/query-pagination-next/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/query-pagination-next/index.php b/packages/block-library/src/query-pagination-next/index.php index 7e3c1a6b5ab6c0..829e7b507d5270 100644 --- a/packages/block-library/src/query-pagination-next/index.php +++ b/packages/block-library/src/query-pagination-next/index.php @@ -43,7 +43,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block $content = get_next_posts_link( $label, $max_page ); remove_filter( 'next_posts_link_attributes', $filter_link_attributes ); } elseif ( ! $max_page || $max_page > $page ) { - $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); + $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); $max_num_pages = (int) $custom_query->max_num_pages; if ( ! $max_num_pages ) { return '';