Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Permalinks: Limit pagination for posts with comments. 

Additionally, redirect pages back to the source page if comments don't exist.

Props devrekli, carike, sumanm, mukesh27, chaion07, audrasjb, whyisjake, SergeyBiryukov.

Fixes #50233.

Built from https://develop.svn.wordpress.org/trunk@51118


git-svn-id: http://core.svn.wordpress.org/trunk@50727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
whyisjake 2021-06-08 22:51:01 +00:00
parent a8321ed2d5
commit b672d77e87
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/canonical.php
View File

@ -27,6 +27,7 @@
* or query in an attempt to figure the correct page to go to.
*
* @since 2.3.0
* @since 5.8.0 Checks comment page count to limit pagination.
*
* @global WP_Rewrite $wp_rewrite WordPress rewrite component.
* @global bool $is_IIS
@ -504,8 +505,15 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
&& ( 'newest' === $default_comments_page && $cpage > 0
|| 'newest' !== $default_comments_page && $cpage > 1 )
) {
$addl_path = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
$addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
// Checks comment page count to limit pagination.
$per_page = get_option( 'comments_per_page' );
// Get the total number of pages for comments.
$comments_total_pages = ceil( ( $wp_query->post->comment_count ) / $per_page );
if ( $cpage <= $comments_total_pages ) {
$addl_path = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
$addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
}
$redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.8-alpha-51117';
$wp_version = '5.8-alpha-51118';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.