diff -r be944660c56a -r 3d72ae0968f4 wp/wp-includes/blocks/query-pagination-next.php --- a/wp/wp-includes/blocks/query-pagination-next.php Wed Sep 21 18:19:35 2022 +0200 +++ b/wp/wp-includes/blocks/query-pagination-next.php Tue Sep 27 16:37:53 2022 +0200 @@ -20,9 +20,14 @@ $max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0; $wrapper_attributes = get_block_wrapper_attributes(); - $default_label = __( 'Next Page »' ); - $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label; - $content = ''; + $default_label = __( 'Next Page' ); + $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label; + $pagination_arrow = get_query_pagination_arrow( $block, true ); + + if ( $pagination_arrow ) { + $label .= $pagination_arrow; + } + $content = ''; // Check if the pagination is for Query that inherits the global context. if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) { @@ -39,8 +44,9 @@ $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 ) ); - if ( (int) $custom_query->max_num_pages !== $page ) { + $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); + $custom_query_max_pages = (int) $custom_query->max_num_pages; + if ( $custom_query_max_pages && $custom_query_max_pages !== $page ) { $content = sprintf( '%3$s', esc_url( add_query_arg( $page_key, $page + 1 ) ),