Changeset 51118

Timestamp:

06/08/2021 10:49:27 PM (4 years ago)

Author:

whyisjake

Message:

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.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (2 diffs)
• tests/phpunit/tests/link/wpGetCanonicalUrl.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -28 +28 @@
  *
  * @since 2.3.0
+ * @since 5.8.0 Checks comment page count to limit pagination.
  *
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
@@ -505 +506 @@
                     || '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'] );

trunk/tests/phpunit/tests/link/wpGetCanonicalUrl.php

@@ -153 +153 @@
 
     /**
+     * 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.
      *