Changeset 40098

Timestamp:

02/21/2017 07:01:07 AM (8 years ago)

Author:

dd32

Message:

Customize: Allow custom post types to be used in starter content.

Changes WP_Customize_Nav_Menus::insert_auto_draft_post() so it can be invoked for a post_type that is not registered (yet).

Props westonruter.
Merges [39924] to the 4.7 branch.
See #38615, #38114.
Fixes #39610.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• src/wp-includes/class-wp-customize-nav-menus.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (3 diffs)
• tests/phpunit/tests/customize/nav-menus.php (modified) (1 diff)

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

@@ -998 +998 @@
         );
 
+        /*
+         * Obtain all post types referenced in starter content to use in query.
+         * This is needed because 'any' will not account for post types not yet registered.
+         */
+        $post_types = array_filter( array_merge( array( 'attachment' ), wp_list_pluck( $posts, 'post_type' ) ) );
+
         // Re-use auto-draft starter content posts referenced in the current customized state.
         $existing_starter_content_posts = array();
@@ -1004 +1010 @@
                 'post__in' => $starter_content_auto_draft_post_ids,
                 'post_status' => 'auto-draft',
-                'post_type' => 'any',
+                'post_type' => $post_types,
                 'posts_per_page' => -1,
             ) );

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

@@ -787 +787 @@
      */
     public function insert_auto_draft_post( $postarr ) {
-        if ( ! isset( $postarr['post_type'] ) || ! post_type_exists( $postarr['post_type'] )  ) {
+        if ( ! isset( $postarr['post_type'] ) ) {
             return new WP_Error( 'unknown_post_type', __( 'Unknown post type' ) );
         }

branches/4.7/tests/phpunit/tests/customize/manager.php

@@ -373 +373 @@
                     'post_title' => 'Custom',
                     'thumbnail' => '{{waffles}}',
+                ),
+                'unknown_cpt' => array(
+                    'post_type' => 'unknown_cpt',
+                    'post_title' => 'Unknown CPT',
                 ),
             ),
@@ -442 +446 @@
 
         $posts_by_name = array();
-        $this->assertCount( 6, $changeset_values['nav_menus_created_posts'] );
+        $this->assertCount( 7, $changeset_values['nav_menus_created_posts'] );
         $this->assertContains( $existing_published_home_page_id, $changeset_values['nav_menus_created_posts'], 'Expected reuse of non-auto-draft posts.' );
         $this->assertContains( $existing_canola_attachment_id, $changeset_values['nav_menus_created_posts'], 'Expected reuse of non-auto-draft attachment.' );
@@ -462 +466 @@
             $posts_by_name[ $post_name ] = $post->ID;
         }
-        $this->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom' ), array_keys( $posts_by_name ) );
+        $this->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom', 'unknown-cpt' ), array_keys( $posts_by_name ) );
         $this->assertEquals( 'Custom', get_post( $posts_by_name['custom'] )->post_title );
         $this->assertEquals( 'sample-page-template.php', get_page_template_slug( $posts_by_name['about'] ) );

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

@@ -539 +539 @@
         $this->assertEquals( 'unknown_post_type', $r->get_error_code() );
 
-        $r = $menus->insert_auto_draft_post( array( 'post_type' => 'fake' ) );
+        // Non-existent post types allowed as of #39610.
+        $r = $menus->insert_auto_draft_post( array( 'post_title' => 'Non-existent', 'post_type' => 'nonexistent' ) );
+        $this->assertInstanceOf( 'WP_Post', $r );
+
+        $r = $menus->insert_auto_draft_post( array( 'post_type' => 'post' ) );
         $this->assertInstanceOf( 'WP_Error', $r );
-        $this->assertEquals( 'unknown_post_type', $r->get_error_code() );
+        $this->assertEquals( 'empty_title', $r->get_error_code() );
 
         $r = $menus->insert_auto_draft_post( array( 'post_status' => 'publish', 'post_title' => 'Bad', 'post_type' => 'post' ) );