Ticket #19693: 19693.2.diff

wp-includes/canonical.php

@@ -100 +100 @@
                 }
 
                 if ( ! $redirect_url ) {
-                        if ( $redirect_url = redirect_guess_404_permalink( $requested_url ) ) {
+                        if ( $redirect_url = apply_filters( 'redirect_guess_404_permalink', $requested_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 );
                         }
                 }
@@ -489 +489 @@
         if ( get_query_var('name') ) {
                 $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
 
-                // if any of post_type, year, monthnum, or day are set, use them to refine the query
+                // Use either an explicitly set post_type or search in all registered public post types
                 if ( get_query_var('post_type') )
-                        $where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
+                        $where .= $wpdb->prepare( " AND post_type = %s", get_query_var('post_type') );
+                else
+                        $where .= $wpdb->prepare( " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')" );
+                // If any of year, monthnum, or day are set, use them to refine the query
                 if ( get_query_var('year') )
                         $where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
                 if ( get_query_var('monthnum') )

wp-includes/default-filters.php

@@ -191 +191 @@
 add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
 add_filter( 'editable_slug',            'urldecode'                           );
 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
+add_filter( 'redirect_guess_404_permalink', 'redirect_guess_404_permalink'    );
 
 // Actions
 add_action( 'wp_head',             'wp_enqueue_scripts',              1     );