Ticket #14773: 12456.4.diff

src/wp-includes/canonical.php

@@ -225 +225 @@
                 }
 
                 // Post Paging
-                if ( is_singular() && ! is_front_page() && 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' );
-                        $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+                if ( is_singular() && ! is_front_page() ) {
+                        if ( get_query_var('page') ) {
+                                if ( ! $redirect_url )
+                                        $redirect_url = set_url_scheme( get_permalink( get_queried_object_id() ) );
+                                $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+                                $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+                        } else {
+                                $post_url = set_url_scheme( get_permalink( get_queried_object_id() ) );
+                                // If the full post's URL is not within the requested url, lets redirect there.
+                                if ( strpos( $requested_url, $post_url ) === false )
+                                        $redirect_url = $post_url;
+                        }
                 }
 
                 // paging and feeds

tests/phpunit/tests/canonical.php

@@ -196 +196 @@
                         // Pages
                         array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 17653 ), // Page rules always set 'page'
                         array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
+                        array( '/sample-page---/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
+                        array( '/---sample-page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
                         array( '/child-page-1/', '/parent-page/child-page-1/'),
                         array( '/?page_id=144', '/parent-page/child-page-1/'),
                         array( '/abo', '/about/' ),