Changeset 47760

Timestamp:

05/04/2020 10:40:06 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Redirect paged requests for a static page assigned as the "Posts page".

This avoids displaying duplicate content of the home page under different URLs with appended page numbers.

This change only affects the <!--nextpage--> pagination (page query variable) and not the regular multiple posts pagination (paged query variable).

The posts page does not support the <!--nextpage--> pagination, so requests for invalid page numbers should be redirected to the page permalink, applying the logic previously implemented for single posts or pages.

Follow-up to [34492], [47727].

Props jeremyfelt, sachit.tandukar, SergeyBiryukov.
Fixes #45337. See #40773, #28081, #11694.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (2 diffs)
• src/wp-includes/class-wp.php (modified) (2 diffs)
• tests/phpunit/tests/canonical/pageOnFront.php (modified) (1 diff)
• tests/phpunit/tests/canonical/paged.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -187 +187 @@
         }
 
+        // Strip off non-existing <!--nextpage--> links from single posts or pages.
+        if ( get_query_var( 'page' ) ) {
+            $post_id = 0;
+
+            if ( $wp_query->queried_object instanceof WP_Post ) {
+                $post_id = $wp_query->queried_object->ID;
+            } elseif ( $wp_query->post ) {
+                $post_id = $wp_query->post->ID;
+            }
+
+            $redirect_url = get_permalink( $post_id );
+
+            $redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+            $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+        }
+
         if ( ! $redirect_url ) {
             $redirect_url = redirect_guess_404_permalink();
@@ -197 +213 @@
                 );
             }
-        }
-
-        // Strip off non-existing page links from single posts or pages.
-        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'] );
-
-            $redirect_url = get_permalink( $wp_query->post->ID );
         }
     } elseif ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) {

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

@@ -671 +671 @@
             $content_found = true;
 
-            $post = isset( $wp_query->post ) ? $wp_query->post : null;
-
-            // Only set X-Pingback for single posts that allow pings.
-            if ( is_singular() && $post && pings_open( $post ) && ! headers_sent() ) {
-                header( 'X-Pingback: ' . get_bloginfo( 'pingback_url', 'display' ) );
-            }
-
-            // Check for paged content that exceeds the max number of pages.
             if ( is_singular() ) {
+                $post = isset( $wp_query->post ) ? $wp_query->post : null;
+
+                // Only set X-Pingback for single posts that allow pings.
+                if ( $post && pings_open( $post ) && ! headers_sent() ) {
+                    header( 'X-Pingback: ' . get_bloginfo( 'pingback_url', 'display' ) );
+                }
+
+                // Check for paged content that exceeds the max number of pages.
                 $next = '<!--nextpage-->';
                 if ( $post && ! empty( $this->query_vars['page'] ) ) {
@@ -692 +692 @@
             }
 
+            // The posts page does not support the <!--nextpage--> pagination.
+            if ( $wp_query->is_posts_page && ! empty( $this->query_vars['page'] ) ) {
+                $content_found = false;
+            }
+
             if ( $content_found ) {
                 $set_404 = false;

trunk/tests/phpunit/tests/canonical/pageOnFront.php

@@ -59 +59 @@
             // The page designated as the front page should redirect to the front of the site.
             array( '/front-page/', '/' ),
+            // The front page supports the <!--nextpage--> pagination.
             array( '/front-page/2/', '/page/2/' ),
             array( '/front-page/?page=2', '/page/2/' ),
+            // The posts page does not support the <!--nextpage--> pagination.
+            array( '/blog-page/2/', '/blog-page/' ),
+            array( '/blog-page/?page=2', '/blog-page/' ),
+            // The posts page supports regular pagination.
             array( '/blog-page/?paged=2', '/blog-page/page/2/' ),
         );

trunk/tests/phpunit/tests/canonical/paged.php

@@ -7 +7 @@
 class Tests_Canonical_Paged extends WP_Canonical_UnitTestCase {
 
-    function test_nextpage() {
+    function test_redirect_canonical_with_nextpage_pagination() {
         $para = 'This is a paragraph.
             This is a paragraph.
@@ -20 +20 @@
         );
 
-        $link  = parse_url( get_permalink( $post_id ), PHP_URL_PATH );
-        $paged = $link . '4/';
+        $link = parse_url( get_permalink( $post_id ), PHP_URL_PATH );
 
-        $this->assertCanonical( $paged, $link );
+        // Existing page should be displayed as is.
+        $this->assertCanonical( $link . '3/', $link . '3/' );
+        // Non-existing page should redirect to the permalink.
+        $this->assertCanonical( $link . '4/', $link );
     }
+
 }