Ticket #16557: 16557.diff

src/wp-includes/canonical.php

@@ -136 +136 @@
                 }
 
                 if ( ! $redirect_url ) {
-                        if ( $redirect_url = redirect_guess_404_permalink() ) {
+                        $redirect_url = apply_filters( '404_redirect', $redirect_url );
+                        if ( $redirect_url ) {
                                 $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
                         }
                 }
@@ -553 +554 @@
         return false;
 }
 
+add_filter( '404_redirect', 'redirect_guess_404_permalink' );
+
 add_action('template_redirect', 'redirect_canonical');
 
 function wp_redirect_admin_locations() {

tests/phpunit/tests/canonical.php

@@ -280 +280 @@
                         // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)
                 );
         }
+
+
+        /**
+         * @ticket 16557
+         */
+        public function test_guess_redirect() {
+                // Fake a 404
+                $GLOBALS[ 'wp_query' ]->is_404 = true;
+
+                // Fake a request to /child-page-1/
+                set_query_var( 'name', 'child-page-1' );
+
+                $test_url = '/child-page-1/';
+                $expected = '/child-page-1/';
+
+                remove_filter( '404_redirect', 'redirect_guess_404_permalink' );
+
+                $this->test( $test_url, $expected, 16557 );
+
+        }
+
 }