Make WordPress Core

Changeset 51125


Ignore:
Timestamp:
06/08/2021 11:31:46 PM (3 years ago)
Author:
whyisjake
Message:

Permalinks: Revert the changes stemming from pagination limits.

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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/canonical.php

    r51118 r51125  
    2828 *
    2929 * @since 2.3.0
    30  * @since 5.8.0 Checks comment page count to limit pagination.
    3130 *
    3231 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
     
    506505                    || 'newest' !== $default_comments_page && $cpage > 1 )
    507506            ) {
    508                 // Checks comment page count to limit pagination.
    509                 $per_page = get_option( 'comments_per_page' );
    510 
    511                 // Get the total number of pages for comments.
    512                 $comments_total_pages = ceil( ( $wp_query->post->comment_count ) / $per_page );
    513                 if ( $cpage <= $comments_total_pages ) {
    514                     $addl_path  = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
    515                     $addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
    516                 }
     507                $addl_path  = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
     508                $addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
    517509
    518510                $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
  • trunk/tests/phpunit/tests/link/wpGetCanonicalUrl.php

    r51118 r51125  
    153153
    154154    /**
    155      * Limit pagination for comments.
    156      *
    157      *  @ticket 50233
    158      */
    159     public function test_comments_limit_paged_with_plain_permalink_structure() {
    160         $cpage = 5;
    161 
    162         $link = add_query_arg(
    163             array(
    164                 'cpage' => $cpage,
    165                 'foo'   => 'bar',
    166             ),
    167             get_permalink( self::$post_id )
    168         );
    169 
    170         $this->go_to( $link );
    171         $expected = get_permalink( self::$post_id ) . '#comments';
    172         $this->assertSame( $expected, wp_get_canonical_url( self::$post_id ) );
    173     }
    174 
    175     /**
    176155     * Filter callback for testing of filter usage.
    177156     *
Note: See TracChangeset for help on using the changeset viewer.