Ticket #11863: 11863.18.diff

src/wp-includes/post.php

@@ -5340 +5340 @@
                 return;
         }
 
+        // Don't bother if the slug is being changed by untrashing a post.
+        if ( '__trashed' === substr( $post_before->post_name, -9 ) ) {
+                return;
+        }
+
         // 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 ) ) {
                 return;

tests/phpunit/tests/post/wpCheckForChangedSlugs.php

@@ +1 @@
+<?php
+
+/**
+ * @group post
+ */
+class Tests_WPCheckForChangedSlugs extends WP_UnitTestCase {
+
+        /**
+         * @ticket 11863
+         */
+        function test_untrashing_a_post_should_not_store_the_temporary_trashed_slug() {
+                $about_page_id = self::factory()->post->create( array(
+                        'post_type' => 'page',
+                        'post_title' => 'About',
+                        'post_status' => 'publish'
+                ) );
+                wp_trash_post( $about_page_id );
+
+                wp_untrash_post( $about_page_id );
+
+                $this->assertEquals( false, get_post_meta( $about_page_id, '_wp_old_slug', true ) );
+        }
+}