Ticket #4328: 4328.1.diff

src/wp-includes/canonical.php

@@ -294 +294 @@
 
                         // 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'] ) ) {
+
+                        $feeds = array();
+                        foreach ( $wp_rewrite->feeds as $_feed ) {
+                                $feeds[] = preg_quote( $_feed, '#' );
+                        }
+                        $feeds = implode( '|', $feeds );
+
+                        while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( "#/(comments/?)?($feeds)(/+)?$#", $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( "#/(comments/?)?($feeds)(/+|$)#", '/', $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
                         }
 

src/wp-includes/post.php

@@ -5708 +5708 @@
         }
 
         // We're only concerned with published, non-hierarchical objects.
-        if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+        if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) ) {
                 return;
         }
 

src/wp-includes/query.php

@@ -953 +953 @@
                         $post_type = get_query_var( 'post_type' );
                 } elseif ( get_query_var( 'attachment' ) ) {
                         $post_type = 'attachment';
-                } elseif ( get_query_var( 'pagename' ) ) {
-                        $post_type = 'page';
                 } else {
-                        $post_type = 'post';
+                        $post_type = ''; // Open to all options
                 }
 
                 if ( is_array( $post_type ) ) {
@@ -966 +964 @@
                         $post_type = reset( $post_type );
                 }
 
-                // Do not attempt redirect for hierarchical post types
-                if ( is_post_type_hierarchical( $post_type ) ) {
-                        return;
-                }
-
                 $id = _find_post_by_old_slug( $post_type );
 
                 if ( ! $id ) {
@@ -1032 +1025 @@
 function _find_post_by_old_slug( $post_type ) {
         global $wpdb;
 
-        $query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, get_query_var( 'name' ) );
+        $default_post_type_whitelist = array_keys( get_post_types( array( 'public' => true ) ) );
+        $post_type_whitelist = apply_filters( 'find_post_by_old_slug_post_types', $default_post_type_whitelist );
+
+        if ( $post_type && ! in_array( $post_type, $post_type_whitelist ) ) {
+                return 0;
+        }
+
+        $query = "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id";
+        if ( $post_type ) {
+                $query .= $wpdb->prepare( " AND post_type = %s", $post_type );
+        } else {
+                $placeholders = trim( str_repeat( '%s,', count( $post_type_whitelist ) ), ',' );
+                $query .= $wpdb->prepare( " AND post_type IN ($placeholders)", $post_type_whitelist );
+        }
+        $query .= $wpdb->prepare( " AND meta_key = '_wp_old_slug' AND meta_value = %s", get_query_var( 'name' ) );
 
         // if year, monthnum, or day have been specified, make our query more precise
         // just in case there are multiple identical _wp_old_slug values
@@ -1067 +1074 @@
 function _find_post_by_old_date( $post_type ) {
         global $wpdb;
 
+        $default_post_type_whitelist = array_keys( get_post_types( array( 'public' => true ) ) );
+        $post_type_whitelist = apply_filters( 'find_post_by_old_slug_post_types', $default_post_type_whitelist );
+
+        if ( $post_type && ! in_array( $post_type, $post_type_whitelist ) ) {
+                return 0;
+        }
+
         $date_query = '';
         if ( get_query_var( 'year' ) ) {
                 $date_query .= $wpdb->prepare( " AND YEAR(pm_date.meta_value) = %d", get_query_var( 'year' ) );
@@ -1080 +1094 @@
 
         $id = 0;
         if ( $date_query ) {
-                $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta AS pm_date, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_date' AND post_name = %s" . $date_query, $post_type, get_query_var( 'name' ) ) );
+                $query = "SELECT post_id FROM $wpdb->postmeta AS pm_date, $wpdb->posts WHERE ID = post_id";
+                if ( $post_type ) {
+                        $query .= $wpdb->prepare( " AND post_type = %s", $post_type );
+                } else {
+                        $placeholders = trim( str_repeat( '%s,', count( $post_type_whitelist ) ), ',' );
+                        $query .= $wpdb->prepare( " AND post_type IN ($placeholders)", $post_type_whitelist );
+                }
+                $query .= $wpdb->prepare( " AND meta_key = '_wp_old_date' AND post_name = %s" . $date_query, get_query_var( 'name' ) );
+
+                $id = (int) $wpdb->get_var( $query );
 
                 if ( ! $id ) {
+                        $query = "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id";
+                        if ( $post_type ) {
+                                $query .= $wpdb->prepare( " AND post_type = %s", $post_type );
+                        } else {
+                                $placeholders = trim( str_repeat( '%s,', count( $post_type_whitelist ) ), ',' );
+                                $query .= $wpdb->prepare( " AND post_type IN ($placeholders)", $post_type_whitelist );
+                        }
+                        $query .= $wpdb->prepare( " AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, get_query_var( 'name' ) );
+
                         // Check to see if an old slug matches the old date
-                        $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id AND post_type = %s AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, $post_type, get_query_var( 'name' ) ) );
+                        $id = (int) $wpdb->get_var( $query );
                 }
         }