Ticket #39078: 39078.2.diff

src/wp-includes/class-wp-customize-manager.php

@@ -1006 +1006 @@
                                 'posts_per_page' => -1,
                         ) );
                         foreach ( $existing_posts_query->posts as $existing_post ) {
-                                $existing_starter_content_posts[ $existing_post->post_type . ':' . $existing_post->post_name ] = $existing_post;
+                                $post_name = $existing_post->post_name;
+                                if ( empty( $post_name ) ) {
+                                        $post_name = get_post_meta( $existing_post->ID, '_customize_draft_post_name', true );
+                                }
+                                $existing_starter_content_posts[ $existing_post->post_type . ':' . $post_name ] = $existing_post;
                         }
                 }
 

src/wp-includes/class-wp-customize-nav-menus.php

@@ -803 +803 @@
                 if ( empty( $postarr['post_name'] ) ) {
                         $postarr['post_name'] = sanitize_title( $postarr['post_title'] );
                 }
+                if ( ! isset( $postarr['meta_input'] ) ) {
+                        $postarr['meta_input'] = array();
+                }
+                $postarr['meta_input']['_customize_draft_post_name'] = $postarr['post_name'];
+                unset( $postarr['post_name'] );
 
                 add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
                 $r = wp_insert_post( wp_slash( $postarr ), true );
@@ -1192 +1197 @@
                 if ( ! empty( $post_ids ) ) {
                         foreach ( $post_ids as $post_id ) {
                                 $target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish';
+                                $args = array(
+                                        'ID' => $post_id,
+                                        'post_status' => $target_status,
+                                );
+                                $post_name = get_post_meta( $post_id, '_customize_draft_post_name', true );
+                                if ( $post_name ) {
+                                        $args['post_name'] = $post_name;
+                                }
 
                                 // Note that wp_publish_post() cannot be used because unique slugs need to be assigned.
-                                wp_update_post( array( 'ID' => $post_id, 'post_status' => $target_status ) );
+                                wp_update_post( wp_slash( $args ) );
+
+                                delete_post_meta( $post_id, '_customize_draft_post_name' );
                         }
                 }
         }

tests/phpunit/tests/customize/manager.php

@@ -454 +454 @@
                         } else {
                                 $this->assertEquals( 'auto-draft', $post->post_status );
                         }
-                        $posts_by_name[ $post->post_name ] = $post->ID;
+                        $post_name = $post->post_name;
+                        if ( empty( $post_name ) ) {
+                                $post_name = get_post_meta( $post->ID, '_customize_draft_post_name', true );
+                        }
+                        $posts_by_name[ $post_name ] = $post->ID;
                 }
                 $this->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom' ), array_keys( $posts_by_name ) );
                 $this->assertEquals( 'Custom', get_post( $posts_by_name['custom'] )->post_title );

tests/phpunit/tests/customize/nav-menus.php

@@ -549 +549 @@
                 $r = $menus->insert_auto_draft_post( array( 'post_title' => 'Hello World', 'post_type' => 'post' ) );
                 $this->assertInstanceOf( 'WP_Post', $r );
                 $this->assertEquals( 'Hello World', $r->post_title );
-                $this->assertEquals( 'hello-world', $r->post_name );
+                $this->assertEquals( '', $r->post_name );
+                $this->assertEquals( 'hello-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );
                 $this->assertEquals( 'post', $r->post_type );
 
                 $r = $menus->insert_auto_draft_post( array( 'post_title' => 'Hello World', 'post_type' => 'post', 'post_name' => 'greetings-world', 'post_content' => 'Hi World' ) );
                 $this->assertInstanceOf( 'WP_Post', $r );
                 $this->assertEquals( 'Hello World', $r->post_title );
                 $this->assertEquals( 'post', $r->post_type );
-                $this->assertEquals( 'greetings-world', $r->post_name );
+                $this->assertEquals( '', $r->post_name );
+                $this->assertEquals( 'greetings-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );
                 $this->assertEquals( 'Hi World', $r->post_content );
         }
 
@@ -739 +741 @@
                 $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
                 do_action( 'customize_register', $this->wp_customize );
 
-                $post_ids = $this->factory()->post->create_many( 3, array(
-                        'post_status' => 'auto-draft',
-                        'post_type' => 'post',
-                        'post_name' => 'auto-draft',
-                ) );
+                $post_ids = array();
+                for ( $i = 0; $i < 3; $i += 1 ) {
+                        $r = $menus->insert_auto_draft_post( array(
+                                'post_title' => 'Auto Draft ' . $i,
+                                'post_type' => 'post',
+                                'post_name' => 'auto-draft-' . $i,
+                        ) );
+                        $this->assertInstanceOf( 'WP_Post', $r );
+                        $post_ids[] = $r->ID;
+                }
+
                 $pre_published_post_id = $this->factory()->post->create( array( 'post_status' => 'publish' ) );
 
                 $setting_id = 'nav_menus_created_posts';
@@ -754 +762 @@
                 $this->assertEquals( $post_ids, $setting->post_value() );
                 foreach ( $post_ids as $post_id ) {
                         $this->assertEquals( 'auto-draft', get_post_status( $post_id ) );
+                        $this->assertEmpty( get_post( $post_id )->post_name );
+                        $this->assertNotEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );
                 }
 
                 $save_action_count = did_action( 'customize_save_nav_menus_created_posts' );
@@ -761 +771 @@
                 $this->assertEquals( $save_action_count + 1, did_action( 'customize_save_nav_menus_created_posts' ) );
                 foreach ( $post_ids as $post_id ) {
                         $this->assertEquals( 'publish', get_post_status( $post_id ) );
+                        $this->assertRegExp( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );
+                        $this->assertEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );
                 }
 
                 // Ensure that unique slugs were assigned.