WordPress.org

Make WordPress Core

Ticket #39078: 39078.1.diff

File 39078.1.diff, 6.2 KB (added by westonruter, 4 years ago)
  • src/wp-includes/class-wp-customize-manager.php

    diff --git src/wp-includes/class-wp-customize-manager.php src/wp-includes/class-wp-customize-manager.php
    index 8905721..2eb021e 100644
    final class WP_Customize_Manager { 
    10061006                                'posts_per_page' => -1,
    10071007                        ) );
    10081008                        foreach ( $existing_posts_query->posts as $existing_post ) {
    1009                                 $existing_starter_content_posts[ $existing_post->post_type . ':' . $existing_post->post_name ] = $existing_post;
     1009                                $post_name = $existing_post->post_name;
     1010                                if ( empty( $post_name ) ) {
     1011                                        $post_name = get_post_meta( $existing_post->ID, '_starter_content_post_name', true );
     1012                                }
     1013                                $existing_starter_content_posts[ $existing_post->post_type . ':' . $post_name ] = $existing_post;
    10101014                        }
    10111015                }
    10121016
  • src/wp-includes/class-wp-customize-nav-menus.php

    diff --git src/wp-includes/class-wp-customize-nav-menus.php src/wp-includes/class-wp-customize-nav-menus.php
    index 1305a14..7efb6c4 100644
    final class WP_Customize_Nav_Menus { 
    803803                if ( empty( $postarr['post_name'] ) ) {
    804804                        $postarr['post_name'] = sanitize_title( $postarr['post_title'] );
    805805                }
     806                if ( ! isset( $postarr['meta_input'] ) ) {
     807                        $postarr['meta_input'] = array();
     808                }
     809                $postarr['meta_input']['_starter_content_post_name'] = $postarr['post_name'];
     810                unset( $postarr['post_name'] );
    806811
    807812                add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
    808813                $r = wp_insert_post( wp_slash( $postarr ), true );
    final class WP_Customize_Nav_Menus { 
    11921197                if ( ! empty( $post_ids ) ) {
    11931198                        foreach ( $post_ids as $post_id ) {
    11941199                                $target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish';
     1200                                $args = array(
     1201                                        'ID' => $post_id,
     1202                                        'post_status' => $target_status,
     1203                                );
     1204                                $post_name = get_post_meta( $post_id, '_starter_content_post_name', true );
     1205                                if ( $post_name ) {
     1206                                        $args['post_name'] = $post_name;
     1207                                }
    11951208
    11961209                                // Note that wp_publish_post() cannot be used because unique slugs need to be assigned.
    1197                                 wp_update_post( array( 'ID' => $post_id, 'post_status' => $target_status ) );
     1210                                wp_update_post( wp_slash( $args ) );
     1211
     1212                                delete_post_meta( $post_id, '_starter_content_post_name' );
    11981213                        }
    11991214                }
    12001215        }
  • tests/phpunit/tests/customize/manager.php

    diff --git tests/phpunit/tests/customize/manager.php tests/phpunit/tests/customize/manager.php
    index 345e666..c4403e0 100644
    class Tests_WP_Customize_Manager extends WP_UnitTestCase { 
    454454                        } else {
    455455                                $this->assertEquals( 'auto-draft', $post->post_status );
    456456                        }
    457                         $posts_by_name[ $post->post_name ] = $post->ID;
     457                        $post_name = $post->post_name;
     458                        if ( empty( $post_name ) ) {
     459                                $post_name = get_post_meta( $post->ID, '_starter_content_post_name', true );
     460                        }
     461                        $posts_by_name[ $post_name ] = $post->ID;
    458462                }
    459463                $this->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom' ), array_keys( $posts_by_name ) );
    460464                $this->assertEquals( 'Custom', get_post( $posts_by_name['custom'] )->post_title );
  • tests/phpunit/tests/customize/nav-menus.php

    diff --git tests/phpunit/tests/customize/nav-menus.php tests/phpunit/tests/customize/nav-menus.php
    index f8b38a1..ef52ff9 100644
    class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase { 
    549549                $r = $menus->insert_auto_draft_post( array( 'post_title' => 'Hello World', 'post_type' => 'post' ) );
    550550                $this->assertInstanceOf( 'WP_Post', $r );
    551551                $this->assertEquals( 'Hello World', $r->post_title );
    552                 $this->assertEquals( 'hello-world', $r->post_name );
     552                $this->assertEquals( '', $r->post_name );
     553                $this->assertEquals( 'hello-world', get_post_meta( $r->ID, '_starter_content_post_name', true ) );
    553554                $this->assertEquals( 'post', $r->post_type );
    554555
    555556                $r = $menus->insert_auto_draft_post( array( 'post_title' => 'Hello World', 'post_type' => 'post', 'post_name' => 'greetings-world', 'post_content' => 'Hi World' ) );
    556557                $this->assertInstanceOf( 'WP_Post', $r );
    557558                $this->assertEquals( 'Hello World', $r->post_title );
    558559                $this->assertEquals( 'post', $r->post_type );
    559                 $this->assertEquals( 'greetings-world', $r->post_name );
     560                $this->assertEquals( '', $r->post_name );
     561                $this->assertEquals( 'greetings-world', get_post_meta( $r->ID, '_starter_content_post_name', true ) );
    560562                $this->assertEquals( 'Hi World', $r->post_content );
    561563        }
    562564
    class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase { 
    739741                $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
    740742                do_action( 'customize_register', $this->wp_customize );
    741743
    742                 $post_ids = $this->factory()->post->create_many( 3, array(
    743                         'post_status' => 'auto-draft',
    744                         'post_type' => 'post',
    745                         'post_name' => 'auto-draft',
    746                 ) );
     744                $post_ids = array();
     745                for ( $i = 0; $i < 3; $i += 1 ) {
     746                        $r = $menus->insert_auto_draft_post( array(
     747                                'post_title' => 'Auto Draft ' . $i,
     748                                'post_type' => 'post',
     749                                'post_name' => 'auto-draft-' . $i,
     750                        ) );
     751                        $this->assertInstanceOf( 'WP_Post', $r );
     752                        $post_ids[] = $r->ID;
     753                }
     754
    747755                $pre_published_post_id = $this->factory()->post->create( array( 'post_status' => 'publish' ) );
    748756
    749757                $setting_id = 'nav_menus_created_posts';
    class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase { 
    754762                $this->assertEquals( $post_ids, $setting->post_value() );
    755763                foreach ( $post_ids as $post_id ) {
    756764                        $this->assertEquals( 'auto-draft', get_post_status( $post_id ) );
     765                        $this->assertEmpty( get_post( $post_id )->post_name );
     766                        $this->assertNotEmpty( get_post_meta( $post_id, '_starter_content_post_name', true ) );
    757767                }
    758768
    759769                $save_action_count = did_action( 'customize_save_nav_menus_created_posts' );
    class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase { 
    761771                $this->assertEquals( $save_action_count + 1, did_action( 'customize_save_nav_menus_created_posts' ) );
    762772                foreach ( $post_ids as $post_id ) {
    763773                        $this->assertEquals( 'publish', get_post_status( $post_id ) );
     774                        $this->assertRegExp( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );
     775                        $this->assertEmpty( get_post_meta( $post_id, '_starter_content_post_name', true ) );
    764776                }
    765777
    766778                // Ensure that unique slugs were assigned.