Ticket #23074: combined.2.patch

wp-includes/post.php

@@ -4520 +4520 @@
  * @return int Same as $post_id
  */
 function wp_check_for_changed_slugs($post_id, $post, $post_before) {
-        // dont bother if it hasnt changed
+        if ( empty( $post_before->post_name ) )
+                return;
+
+        $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
+
+        // if the new slug was used previously, delete it from the list
+        if ( in_array($post->post_name, $old_slugs) )
+                delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
+
+        // don't bother if it hasn't changed
         if ( $post->post_name == $post_before->post_name )
                 return;
 
@@ -4528 +4537 @@
         if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) )
                 return;
 
-        $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
-
         // if we haven't added this old slug before, add it now
-        if ( !empty( $post_before->post_name ) && !in_array($post_before->post_name, $old_slugs) )
+        if ( !in_array($post_before->post_name, $old_slugs) )
                 add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);
-
-        // if the new slug was used previously, delete it from the list
-        if ( in_array($post->post_name, $old_slugs) )
-                delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
 }
 
 /**

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 (only in legacy data).
+                $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'] )