Ticket #23074: query.php.patch

wp-includes/query.php

@@ -3923 +3923 @@
 
                 $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, $wp_query->query_vars['name']);
 
+                // Prevent a simple redirect loop due to values in '_wp_old_slug' not deleted
+                // when in an unpublished status.
+                $query .= $wpdb->prepare(" AND post_name != %s", $wp_query->query_vars['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
                 if ( '' != $wp_query->query_vars['year'] )