Changeset 59133 for trunk/src/wp-includes/class-wp.php

Timestamp:

09/30/2024 06:16:18 PM (2 months ago)

Author:

hellofromTonya

Message:

Canonical: Revert redirect when front page's paginated states not found.

r59091 introduced a backward compatibility (BC) break for a static homepage that includes a shortcode's or block's with paginated content that uses the 'paged' query var, e.g. bbPress.

In this use case, attempting to navigate the shortcode / block's pagination causes a canonical redirect, rather than navigating to the next page of content within that shortcode or block.

Follow-up to [59091].

Props davidbinda, jjj.
See #50163, ​#meta5184.

File:

• trunk/src/wp-includes/class-wp.php (modified) (1 diff)

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

@@ -748 +748 @@
 
             if ( is_singular() ) {
-                $post    = isset( $wp_query->post ) ? $wp_query->post : null;
-                $next    = '<!--nextpage-->';
-                $page_qv = is_front_page() ? 'paged' : 'page';
+                $post = isset( $wp_query->post ) ? $wp_query->post : null;
+                $next = '<!--nextpage-->';
 
                 // Check for paged content that exceeds the max number of pages.
-                if ( $post && ! empty( $this->query_vars[ $page_qv ] ) ) {
+                if ( $post && ! empty( $this->query_vars['page'] ) ) {
                     // Check if content is actually intended to be paged.
                     if ( str_contains( $post->post_content, $next ) ) {
-                        $page          = trim( $this->query_vars[ $page_qv ], '/' );
+                        $page          = trim( $this->query_vars['page'], '/' );
                         $content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );
                     } else {