From 98a3f5f11ca6478c41b91b3f03f1ca838d0ee01e Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Tue, 25 Mar 2025 12:54:22 +0000 Subject: [PATCH] Editor: Fix translators note in `wp_unique_id_from_values()`. Follow up to [60075] to fix a typo. Props mukesh27, johnbillion. See #62985. Built from https://develop.svn.wordpress.org/trunk@60079 git-svn-id: http://core.svn.wordpress.org/trunk@59415 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks/blocks-json.php | 3 --- wp-includes/blocks/query-total.php | 2 +- wp-includes/blocks/query-total/block.json | 3 +++ wp-includes/functions.php | 2 +- wp-includes/version.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/blocks/blocks-json.php b/wp-includes/blocks/blocks-json.php index f2ea26ab7b..d89be5750e 100644 --- a/wp-includes/blocks/blocks-json.php +++ b/wp-includes/blocks/blocks-json.php @@ -5705,9 +5705,6 @@ 'width' => true, 'style' => true ) - ), - 'interactivity' => array( - 'clientNavigation' => true ) ), 'style' => 'wp-block-query-total' diff --git a/wp-includes/blocks/query-total.php b/wp-includes/blocks/query-total.php index 849b2b32a1..f63bb1b98e 100644 --- a/wp-includes/blocks/query-total.php +++ b/wp-includes/blocks/query-total.php @@ -34,7 +34,7 @@ function render_block_core_query_total( $attributes, $content, $block ) { $posts_per_page = (int) $query_to_use->get( 'posts_per_page' ); // Calculate the range of posts being displayed. - $start = ( $current_page - 1 ) * $posts_per_page + 1; + $start = ( 0 === $max_rows ) ? 0 : ( ( $current_page - 1 ) * $posts_per_page + 1 ); $end = min( $start + $posts_per_page - 1, $max_rows ); // Prepare the display based on the `displayType` attribute. diff --git a/wp-includes/blocks/query-total/block.json b/wp-includes/blocks/query-total/block.json index 0b6b9df209..21f6ba0673 100644 --- a/wp-includes/blocks/query-total/block.json +++ b/wp-includes/blocks/query-total/block.json @@ -52,6 +52,9 @@ "width": true, "style": true } + }, + "interactivity": { + "clientNavigation": true } }, "style": "wp-block-query-total" diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 1be3060703..1020ffcfa4 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -9193,7 +9193,7 @@ function wp_unique_id_from_values( array $data, string $prefix = '' ): string { if ( empty( $data ) ) { _doing_it_wrong( __FUNCTION__, - // translators: $data` is the parameter name and must not be translated. + // translators: '$data' is the parameter name and must not be translated. __( 'The $data argument must not be empty.' ), '6.8.0' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index f30a4201c9..503ca7d7b0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-beta3-60078'; +$wp_version = '6.8-beta3-60079'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.