Ticket #23074: 23074.5.diff

src/wp-includes/post.php

@@ -5189 +5189 @@
         }
 
         // 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 ( is_post_type_hierarchical( $post->post_type ) ) {
                 return;
         }
 
+        $valid_status = array(
+                'publish',
+                'private',
+        );
+        if ( ! in_array( $post->post_status, $valid_status ) ) {
+                return;
+        }
+
         $old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' );
 
         // If we haven't added this old slug before, add it now.

tests/phpunit/tests/post/redirects.php

@@ +1 @@
+<?php
+class Tests_Post_Redirects extends WP_UnitTestCase {
+
+        var $post;
+
+        function setUp() {
+                parent::setUp();
+                $post = array(
+                        'post_name'             => 'foo',
+                        'post_title'    => 'Foo',
+                        'post_status'   => 'publish'
+                );
+                $post['ID'] = wp_insert_post( $post );
+                $this->post = $post;
+        }
+
+        function test_old_slugs_private() {
+                $id = $this->post['ID'];
+                $before_post = get_post( $id );
+                $this->post['post_name'] = 'foobar';
+                $this->post['post_status'] = 'private';
+                wp_update_post( $this->post );
+                $old_slugs = (array) get_post_meta( $id, '_wp_old_slug' );
+                $this->AssertTrue( in_array( 'foo', $old_slugs ) );
+        }
+
+        function test_old_slugs_publish() {
+                $id = $this->post['ID'];
+                $this->post['post_name'] = 'foobar';
+                $this->post['post_status'] = 'private';
+                wp_update_post( $this->post );
+                $this->post['post_name'] = 'foo';
+                $this->post['post_status'] = 'publish';
+                wp_update_post( $this->post );
+                $old_slugs = (array) get_post_meta( $id, '_wp_old_slug' );
+                $this->AssertFalse( in_array( 'foo', $old_slugs ) );
+        }
+
+}
+ No newline at end of file