Ticket #13041: 13041.diff

src/wp-includes/canonical.php

@@ -143 +143 @@
                 }
 
                 if ( ! $redirect_url ) {
-                        if ( $redirect_url = redirect_guess_404_permalink() ) {
+                        if ( $redirect_url = redirect_guess_404_permalink( $redirect ) ) {
                                 $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 );
                         }
                 }
@@ -537 +537 @@
  *
  * @return false|string The correct URL if one is found. False on failure.
  */
-function redirect_guess_404_permalink() {
-        global $wpdb, $wp_rewrite;
+function redirect_guess_404_permalink( $query ) {
+        global $wpdb, $wp_query, $wp_rewrite;
 
-        if ( get_query_var('name') ) {
-                $where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
+        if ( ! get_query_var( 'name' ) ) {
+                return false;
+        }
 
-                // if any of post_type, year, monthnum, or day are set, use them to refine the query
-                if ( get_query_var('post_type') )
-                        $where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
-                else
-                        $where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
+        $where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
 
-                if ( get_query_var('year') )
-                        $where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-                if ( get_query_var('monthnum') )
-                        $where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-                if ( get_query_var('day') )
-                        $where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+        // if any of post_type, year, monthnum, or day are set, use them to refine the query
+        if ( get_query_var( 'post_type' ) ) {
+                $where .= $wpdb->prepare( " AND post_type = %s", get_query_var( 'post_type' ) );
+        } else {
+                $query_params = array();
+                parse_str( $query['query'], $query_params );
+                $post_types = get_post_types( array( 'public' => true, '_builtin' => false ), 'objects' );
 
-                $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-                if ( ! $post_id )
-                        return false;
-                if ( get_query_var( 'feed' ) )
-                        return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-                elseif ( get_query_var( 'page' ) )
-                        return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
-                else
-                        return get_permalink( $post_id );
+                $in = array();
+                foreach ( $post_types as $obj ) {
+                        if ( ! is_post_type_viewable( $obj ) || ! $obj->query_var ) {
+                                continue;
+                        }
+
+                        if ( false !== strpos( $query['path'], $obj->query_var . '/' ) ) {
+                                $in[] = $obj->name;
+                                break;
+                        } elseif ( ! empty( $query_params[ $obj->query_var ] ) ) {
+                                $in[] = $obj->name;
+                                break;
+                        }
+                }
+
+                if ( ! empty( $in ) ) {
+                        $where .= " AND post_type IN ('" . implode( "', '", $in ) . "')";
+                } elseif ( get_query_var( 'pagename' ) && ! ( get_query_var('year') || get_query_var('monthnum') || get_query_var('day') ) ) {
+                        // /2015/something/ when /2015/09/18/something is the real permalink
+                        $match = preg_match( '#/[0-9]{4}/#', $query['path'] );
+                        if ( ! $match || ( $match[0] == get_query_var( 'pagename' ) ) ) {
+                                $where .= ' AND post_type = "page"';
+                        } else {
+                                $where .= ' AND post_type = "post"';
+                        }
+                } else {
+                        $where .= ' AND post_type = "post"';
+                }
         }
 
-        return false;
+        if ( get_query_var('year') )
+                $where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
+        if ( get_query_var('monthnum') )
+                $where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
+        if ( get_query_var('day') )
+                $where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+
+        $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
+        if ( ! $post_id )
+                return false;
+        if ( get_query_var( 'feed' ) )
+                return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
+        elseif ( get_query_var( 'page' ) )
+                return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+        else
+                return get_permalink( $post_id );
 }
 
 /**