Ticket #20419: 20419.5.diff

src/wp-admin/includes/post.php

@@ -1223 +1223 @@
 
         // If the user wants to set a new name -- override the current one
         // Note: if empty name is supplied -- use the title instead, see #6072
-        if ( !is_null($name) )
-                $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+        if ( ! is_null( $name ) ) {
+                $post->post_name = sanitize_title( $name ? $name : $title, $post->ID );
+
+        // Otherwise, use our default behavior.
+        } elseif ( empty( $post->post_name ) ) {
+                $post->post_name = sanitize_title( $post->post_title, $post->ID );
+        }
+
+        $post->filter = 'sample';
 
         $post->post_name = wp_unique_post_slug( $post->post_name, (object) array(
                 'ID' => $post->ID,
@@ -1233 +1240 @@
                 'post_parent' => $post->post_parent,
         ) );
 
-        $post->filter = 'sample';
-
         $permalink = get_permalink($post, true);
 
         // Replace custom post_type Token with generic pagename token for ease of use.

src/wp-includes/post.php

@@ -3741 +3741 @@
                 $post->post_parent = $deprecated_post_parent;
         }
 
-        if ( in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post->post_status && 'revision' == $post->post_type ) ) {
+        // There's a few circumstances where we don't want to check for uniqueness: auto-saves and revisions.
+        if ( 'auto-draft' === $post->post_status || ( 'inherit' == $post->post_status && 'revision' == $post->post_type ) ) {
                 return $slug;
         }
 

tests/phpunit/tests/post/wpUniquePostSlug.php

@@ -153 +153 @@
 
         public function whitelist_post_statuses() {
                 return array(
-                        array( 'draft' ),
-                        array( 'pending' ),
+                //      array( 'draft' ),
+                //      array( 'pending' ),
                         array( 'auto-draft' ),
                 );
         }