Ticket #53362: 53362.diff

src/wp-includes/canonical.php

@@ -190 +190 @@
                 }
 
                 // Strip off non-existing <!--nextpage--> links from single posts or pages.
-                if ( get_query_var( 'page' ) ) {
+                if ( '' !== get_query_var( 'page' ) ) {
                         $post_id = 0;
 
                         if ( $wp_query->queried_object instanceof WP_Post ) {

src/wp-includes/class-wp.php

@@ -696 +696 @@
 
                         // If posts were found, check for paged content.
                 } elseif ( $wp_query->posts ) {
-                        $content_found = true;
+                        $content_found  = true;
+                        $page_query_var = isset( $this->query_vars['page'] ) ? $this->query_vars['page'] : '';
 
                         if ( is_singular() ) {
                                 $post = isset( $wp_query->post ) ? $wp_query->post : null;
@@ -708 +709 @@
 
                                 // Check for paged content that exceeds the max number of pages.
                                 $next = '<!--nextpage-->';
-                                if ( $post && ! empty( $this->query_vars['page'] ) ) {
+                                if ( $post && '' !== $page_query_var ) {
+                                        $page = (int) trim( $page_query_var, '/' );
+
                                         // Check if content is actually intended to be paged.
-                                        if ( false !== strpos( $post->post_content, $next ) ) {
-                                                $page          = trim( $this->query_vars['page'], '/' );
-                                                $content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );
+                                        if ( $page > 0 && false !== strpos( $post->post_content, $next ) ) {
+                                                $content_found = $page <= ( substr_count( $post->post_content, $next ) + 1 );
                                         } else {
                                                 $content_found = false;
                                         }
@@ -720 +722 @@
                         }
 
                         // The posts page does not support the <!--nextpage--> pagination.
-                        if ( $wp_query->is_posts_page && ! empty( $this->query_vars['page'] ) ) {
+                        if ( $wp_query->is_posts_page && '' !== $page_query_var ) {
                                 $content_found = false;
                         }
 

tests/phpunit/tests/canonical/paged.php

@@ -6 +6 @@
  */
 class Tests_Canonical_Paged extends WP_Canonical_UnitTestCase {
 
-        public function test_redirect_canonical_with_nextpage_pagination() {
+        public static $post_id;
+
+        public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
                 $para = 'This is a paragraph.
                         This is a paragraph.
                         This is a paragraph.';
                 $next = '<!--nextpage-->';
 
-                $post_id = self::factory()->post->create(
+                self::$post_id = self::factory()->post->create(
                         array(
                                 'post_status'  => 'publish',
                                 'post_content' => "{$para}{$next}{$para}{$next}{$para}",
                         )
                 );
+        }
 
-                $link = parse_url( get_permalink( $post_id ), PHP_URL_PATH );
+        /**
+         * @dataProvider data_redirect_canonical_with_nextpage_pagination
+         */
+        public function test_redirect_canonical_with_nextpage_pagination( $page, $expected_page, $ticket = 0 ) {
+                $link = parse_url( get_permalink( self::$post_id ), PHP_URL_PATH );
 
-                // 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 );
+                $this->assertCanonical( $link . $page, $link . $expected_page, $ticket );
         }
 
+        /**
+         * Data provider for test_redirect_canonical_with_nextpage_pagination().
+         *
+         * @return array[] Test parameters {
+         *     @type string $page          Page number to test, with trailing slash.
+         *     @type string $expected_page Expected page number to be redirected to.
+         *     @type int    $ticket        The ticket the test refers to. Can be skipped if unknown.
+         * }
+         */
+        public function data_redirect_canonical_with_nextpage_pagination() {
+                return array(
+                        'page 0'            => array( '0/', '', 53362 ),
+                        'page 1'            => array( '1/', '', 53362 ),
+                        'existing page'     => array( '3/', '3/', 45337 ),
+                        'non-existing page' => array( '4/', '', 45337 ),
+                );
+        }
 }

tests/phpunit/tests/canonical/pageOnFront.php

@@ -15 +15 @@
                         'page_for_posts',
                         self::factory()->post->create(
                                 array(
-                                        'post_title' => 'blog-page',
+                                        'post_title' => 'posts-page',
                                         'post_type'  => 'page',
                                 )
                         )
@@ -51 +51 @@
                  */
                 return array(
                         // Check against an odd redirect.
-                        array( '/page/2/', '/page/2/', 20385 ),
-                        array( '/?page=2', '/page/2/', 35344 ),
-                        array( '/page/1/', '/', 35344 ),
-                        array( '/?page=1', '/', 35344 ),
+                        'home, page 2, pretty link'   => array( '/page/2/', '/page/2/', 20385 ),
+                        'home, page 2, plain link'    => array( '/?page=2', '/page/2/', 35344 ),
+                        'home, page 1, pretty link'   => array( '/page/1/', '/', 53362 ),
+                        'home, page 1, plain link'    => array( '/?page=1', '/', 53362 ),
+                        'home, page 0, pretty link'   => array( '/page/0/', '/', 53362 ),
+                        'home, page 0, plain link'    => array( '/?page=0', '/', 53362 ),
 
                         // The page designated as the front page should redirect to the front of the site.
-                        array( '/front-page/', '/', 20385 ),
+                        'front page'                  => array( '/front-page/', '/', 20385 ),
                         // The front page supports the <!--nextpage--> pagination.
-                        array( '/front-page/2/', '/page/2/', 35344 ),
-                        array( '/front-page/?page=2', '/page/2/', 35344 ),
+                        'front, page 2, pretty link'  => array( '/front-page/2/', '/page/2/', 35344 ),
+                        'front, page 2, plain link'   => array( '/front-page/?page=2', '/page/2/', 35344 ),
                         // The posts page does not support the <!--nextpage--> pagination.
-                        array( '/blog-page/2/', '/blog-page/', 45337 ),
-                        array( '/blog-page/?page=2', '/blog-page/', 45337 ),
+                        'posts, page 2, pretty link'  => array( '/posts-page/2/', '/posts-page/', 45337 ),
+                        'posts, page 2, plain link'   => array( '/posts-page/?page=2', '/posts-page/', 45337 ),
                         // The posts page supports regular pagination.
-                        array( '/blog-page/?paged=2', '/blog-page/page/2/', 20385 ),
+                        'posts, previous page, plain' => array( '/posts-page/?paged=2', '/posts-page/page/2/', 20385 ),
                 );
         }
 }