Changeset 36237 for trunk/src/wp-includes/canonical.php

Timestamp:

01/09/2016 07:32:42 AM (9 years ago)

Author:

dd32

Message:

Canonical: Generate the correct canonical url for paged posts/pages when they're used as the page_on_front.

This fixes an issue where pages become inacessible on a front page post.

Fixes #35344 for trunk.

File:

• trunk/src/wp-includes/canonical.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -173 +173 @@
             if ( $redirect_url = get_permalink(get_query_var('page_id')) )
                 $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-        } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front')  && ! $redirect_url ) {
+        } elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front')  && ! $redirect_url ) {
             $redirect_url = home_url('/');
         } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
@@ -263 +263 @@
 
         // Post Paging
-        if ( is_singular() && ! is_front_page() && get_query_var('page') ) {
+        if ( is_singular() && get_query_var('page') ) {
             if ( !$redirect_url )
                 $redirect_url = get_permalink( get_queried_object_id() );
-            $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+
+            $page = get_query_var( 'page' );
+            if ( $page > 1 ) {
+                if ( is_front_page() ) {
+                    $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( "$wp_rewrite->pagination_base/$page", 'paged' );
+                } else {
+                    $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( $page, 'single_paged' );
+                }
+            }
             $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
         }