Ticket #16075: 16075.customize.2.diff

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

@@ -109 +109 @@
                 if ( 'post_type' === $type ) {
                         if ( ! get_post_type_object( $object ) ) {
                                 return new WP_Error( 'nav_menus_invalid_post_type' );
+                        } else {
+                                $post_type = get_post_type_object( $object );
                         }
 
                         if ( 0 === $page && 'page' === $object ) {
@@ -121 +123 @@
                                         'object'     => '',
                                         'url'        => home_url(),
                                 );
+                        } elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
+                                // Add a post type archive link.
+                                $items[] = array(
+                                        'id'         => $object . '-archive',
+                                        'title'      => $post_type->labels->archives,
+                                        'type'       => 'post_type_archive',
+                                        'type_label' => __( 'Post Type Archive' ),
+                                        'object'     => $object,
+                                        'url'        => get_post_type_archive_link( $object ),
+                                );
                         }
 
                         $posts = get_posts( array(

src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -324 +324 @@
                         }
                 }
 
+                if ( ! isset( $this->value['title'] ) ) {
+                        $this->value['title'] = '';
+                }
+
                 if ( ! isset( $this->value['_invalid'] ) ) {
-                        $this->value['_invalid'] = (
-                                ( 'post_type' === $this->value['type'] && ! post_type_exists( $this->value['object'] ) )
+                        $this->value['_invalid'] = false;
+                        $is_known_invalid = (
+                                ( ( 'post_type' === $this->value['type'] || 'post_type_archive' === $this->value['type'] ) && ! post_type_exists( $this->value['object'] ) )
                                 ||
                                 ( 'taxonomy' === $this->value['type'] && ! taxonomy_exists( $this->value['object'] ) )
                         );
+                        if ( $is_known_invalid ) {
+                                $this->value['_invalid'] = true;
+                        }
                 }
 
                 // Remove remaining properties available on a setup nav_menu_item post object which aren't relevant to the setting value.