Changeset 47727

Timestamp:

04/30/2020 12:03:11 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Redirect paged requests for non-paginated posts to the post permalink.

This avoids displaying duplicate content of the same post under different URLs and ensures the canonical URL is correct.

Previously, requests for invalid page numbers were only redirected to the post permalink if the post was actually paginated using the <!--nextpage--> marker.

Follow-up to [34492].

Props jeremyfelt, prografika, sachit.tandukar, subrataemfluence, hronak, ekatherine, henry.wright, chesio, dd32, SergeyBiryukov.
Fixes #40773. See #45337, #28081, #11694.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• src/wp-includes/class-wp.php (modified) (1 diff)
• tests/phpunit/tests/canonical.php (modified) (1 diff)
• tests/phpunit/tests/link/wpGetCanonicalURL.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -158 +158 @@
         }
 
-        if ( get_query_var( 'page' ) && $wp_query->post &&
-            false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
+        if ( get_query_var( 'page' ) && $wp_query->post ) {
             $redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
             $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );

trunk/src/wp-includes/class-wp.php

@@ -679 +679 @@
                 // Check for paged content that exceeds the max number of pages.
                 $next = '<!--nextpage-->';
-                if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
-                    $page    = trim( $this->query_vars['page'], '/' );
-                    $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+                if ( $p && ! empty( $this->query_vars['page'] ) ) {
+                    // Check if content is actually intended to be paged.
+                    if ( false !== strpos( $p->post_content, $next ) ) {
+                        $page    = trim( $this->query_vars['page'], '/' );
+                        $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+                    } else {
+                        $success = false;
+                    }
                 }
             }

trunk/tests/phpunit/tests/canonical.php

@@ -176 +176 @@
             array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
 
+            array( '/2008/03/03/comment-test/3/', '/2008/03/03/comment-test/' ),
+            array( '/2008/03/03/comment-test/?page=3', '/2008/03/03/comment-test/' ),
+
             // Comments.
             array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/' ),

trunk/tests/phpunit/tests/link/wpGetCanonicalURL.php

@@ -12 +12 @@
         self::$post_id = $factory->post->create(
             array(
-                'post_status' => 'publish',
+                'post_content' => 'Page 1 <!--nextpage--> Page 2 <!--nextpage--> Page 3',
+                'post_status'  => 'publish',
             )
         );