Ticket #35209: 35209.2.patch

src/wp-admin/js/post.js

@@ -766 +766 @@
 
                                 buttons.html(buttonsOrig);
                                 permalink.html(permalinkOrig);
-                                real_slug.val(new_slug);
+                                real_slug.val($('#editable-post-name-full').text());
                                 $( '.edit-slug' ).focus();
                                 wp.a11y.speak( postL10n.permalinkSaved );
                         });

src/wp-includes/post.php

@@ -3146 +3146 @@
          */
         $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
 
-        $post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
+        // Hack: wp_unique_post_slug() doesn't work for drafts, so we will fake that our post is published.
+        $post_status_draftsafe = ( ! empty( $post_name ) && in_array( $post_status, array( 'draft', 'pending' ) ) ) ? 'publish' : $post_status;
+        $post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status_draftsafe, $post_type, $post_parent );
 
         // Don't unslash.
         $post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : '';