Ticket #23074: 23074.3.diff

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

src/wp-includes/post.php

@@ -5002 +5002 @@
  */
 function wp_check_for_changed_slugs($post_id, $post, $post_before) {
         // dont bother if it hasnt changed
-        if ( $post->post_name == $post_before->post_name )
+        if ( $post->post_name == $post_before->post_name ) {
                 return;
+        }
 
         // we're only concerned with published, non-hierarchical objects
-        if ( $post->post_status != 'publish' || 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' );
 
-        $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) )
                 add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);