Ticket #35344: 35344.2.diff

src/wp-includes/canonical.php

@@ -250 +250 @@
                                                         if ( isset($rewrite_vars[$_qv]) )
                                                                 $redirect['query'] = remove_query_arg($_qv, $redirect['query']);
                                                 }
                                         }
                                 }
 
                         }
                 } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
                         $category = get_category_by_path( $cat );
                         $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
                         if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
                                 $redirect_url = get_permalink($wp_query->get_queried_object_id());
                 }
 
                 // Post Paging
-                if ( is_singular() && ! is_front_page() && get_query_var('page') ) {
+                if ( is_singular() && get_query_var('page') && ( !is_front_page() || ( isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front') ) ) ) {
                         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 ( 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'] );
                 }
 
                 // paging and feeds
                 if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
                         while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
                                 // Strip off paging and feed
                                 $redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
                                 $redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
                                 $redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging
                         }
 
                         $addl_path = '';
                         if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
                                 $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';