mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 04:33:18 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Permalinks: Revert the changes stemming from pagination limits.

Browse Source 
In [51118], an attempt was made to add pagination limits. The added tests need to be updated to ensure that they pass with the new changes.

Reverts [51118].

See #50233.


git-svn-id: https://develop.svn.wordpress.org/trunk@51125 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jake Spurlock 2021-06-08 23:31:46 +00:00
parent 1eb777209d
commit d56d4afd02
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/canonical.php
View File

@ -27,7 +27,6 @@
* 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
@ -505,15 +504,8 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
&& ( 'newest' === $default_comments_page && $cpage > 0
|| 'newest' !== $default_comments_page && $cpage > 1 )
) {
// 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' );
}
$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'] );
}

21
tests/phpunit/tests/link/wpGetCanonicalUrl.php
View File

@ -151,27 +151,6 @@ class Tests_Link_wpGetCanonicalUrl extends WP_UnitTestCase {
$this->assertSame( $this->canonical_url_filter(), $canonical_url );
}
/**
* Limit pagination for comments.
*
* @ticket 50233
*/
public function test_comments_limit_paged_with_plain_permalink_structure() {
$cpage = 5;
$link = add_query_arg(
array(
'cpage' => $cpage,
'foo' => 'bar',
),
get_permalink( self::$post_id )
);
$this->go_to( $link );
$expected = get_permalink( self::$post_id ) . '#comments';
$this->assertSame( $expected, wp_get_canonical_url( self::$post_id ) );
}
/**
* Filter callback for testing of filter usage.
*