Editor: Update `build_comment_query_vars_from_block` from Gutenberg
Follow-up for [53138]. See #55505. Built from https://develop.svn.wordpress.org/trunk@53142 git-svn-id: http://core.svn.wordpress.org/trunk@52731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
4a76af7233
commit
44a0e46c85
wp-includes
|
@ -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 ( 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;
|
||||
|
||||
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'] );
|
||||
$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'] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.0-alpha-53141';
|
||||
$wp_version = '6.0-alpha-53142';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue