Ticket #11694: 11694.2.diff

src/wp-includes/canonical.php

@@ -148 +148 @@
                         }
                 }
 
+                if ( get_query_var( 'page' ) && $wp_query->post &&
+                        false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
+                        $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() ) {
                 // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
                 if ( is_attachment() && ! $redirect_url ) {

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

@@ -1072 +1072 @@
                                         $sub2 .= '?$';
 
                                         //post pagination, e.g. <permalink>/2/
-                                        $match = $match . '(/[0-9]+)?/?$';
+                                        $match = $match . '/?([0-9]+)?/?$';
                                         $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
                                 } else { //not matching a permalink so this is a lot simpler
                                         //close the match and finalise the query

src/wp-includes/class-wp.php

@@ -587 +587 @@
          * @global WP_Query $wp_query
          */
         public function handle_404() {
-                global $wp_query;
+                global $wp_query, $wp;
 
                 // If we've already issued a 404, bail.
                 if ( is_404() )
@@ -596 +596 @@
                 // Never 404 for the admin, robots, or if we found posts.
                 if ( is_admin() || is_robots() || $wp_query->posts ) {
 
+                        $success = true;
                         // Only set X-Pingback for single posts.
                         if ( is_singular() ) {
                                 $p = clone $wp_query->post;
@@ -602 +603 @@
                                 if ( $p && pings_open( $p ) ) {
                                         @header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
                                 }
+
+                                // check for paged content that exceeds the max number of pages
+                                $next = '<!--nextpage-->';
+                                if ( $p && false !== strpos( $p->post_content, $next ) &&
+                                        ! empty( $wp->query_vars['page'] ) &&
+                                        (int) $wp->query_vars['page'] > ( substr_count( $p->post_content, $next ) + 1 ) ) {
+                                        $success = false;
+                                }
                         }
 
-                        status_header( 200 );
-                        return;
+                        if ( $success ) {
+                                status_header( 200 );
+                                return;
+                        }
                 }
 
                 // We will 404 for paged queries, as no posts were found.