Ticket #16075: 16075-hlashbrooke.diff

wp-admin/includes/ajax-actions.php

@@ -1088 +1088 @@
                                 case 'taxonomy' :
                                         $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
                                 break;
+
+                                case 'archive' :
+                                        $_object = get_post_type_object( $menu_item_data['menu-item-object'] );
+                                        $_object->is_archive = true;
+                                break;
                         }
 
                         $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );

wp-admin/includes/nav-menu.php

@@ -69 +69 @@
                 } elseif ( 'post_type' == $item->type ) {
                         $original_object = get_post( $item->object_id );
                         $original_title = get_the_title( $original_object->ID );
+                } elseif ( 'archive' == $item->type ) {
+                        $original_title = false;
                 }
 
                 $classes = array(
@@ -445 +447 @@
         // Register meta boxes
         wp_nav_menu_post_type_meta_boxes();
         add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+        add_meta_box( 'add-post-types', __( 'Post Type Archives' ), 'wp_nav_menu_post_type_archives_meta_box', 'nav-menus', 'side', 'default' );
         wp_nav_menu_taxonomy_meta_boxes();
 
         // Register advanced menu items (columns)
@@ -545 +548 @@
 }
 
 /**
+ * Creates metabox for all post type archives.
+ *
+ * @since 4.3.0
+ */
+function wp_nav_menu_post_type_archives_meta_box () {
+        global $nav_menu_selected_id;
+
+        $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+
+        if ( ! $post_types ) {
+                return;
+        }
+
+        $types = array();
+        foreach ( $post_types as $post_type ) {
+
+                /** This filter is documented in wp-admin/includes/nav-menu.php */
+                $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
+
+                if ( $post_type ) {
+                        $id = $post_type->name;
+
+                        if( ! in_array( $id, array( 'post', 'page' ) ) && $post_type->has_archive ) {
+                                $types[ $id ] = $post_type;
+                                $types[ $id ]->is_archive = true;
+                        }
+                }
+
+        }
+
+        if( empty( $types ) ) {
+                return;
+        }
+
+        ?>
+        <div id="post_type-archives">
+                <div class="tabs-panel-active">
+                        <ul id="post-type-archive-checklist" class="categorychecklist form-no-clear">
+                                <?php
+                                $args['walker'] = new Walker_Nav_Menu_Checklist();
+                                echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $types ), 0, (object) $args );
+                                ?>
+                        </ul>
+                </div>
+        </div><!-- /.tabs-panel -->
+
+        <p class="button-controls">
+                <span class="add-to-menu">
+                        <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-archive-menu-item" id="submit-post_type-archives" />
+                        <span class="spinner"></span>
+                </span>
+        </p>
+        <?php
+}
+
+/**
  * Check whether to disable the Menu Locations meta box submit button
  *
  * @since 3.6.0

wp-includes/nav-menu.php

@@ -367 +367 @@
                         $original_object = get_post( $args['menu-item-object-id'] );
                         $original_parent = (int) $original_object->post_parent;
                         $original_title = $original_object->post_title;
+                } elseif ( 'archive' == $args['menu-item-type'] ) {
+                        $original_object = get_post_type_object( $args['menu-item-object'] );
+                        $original_title = sprintf( __( '%1$s Archive' ), $original_object->labels->name );
+                        $args['menu-item-url'] = get_post_type_archive_link( $original_object->name );
                 }
 
                 if ( $args['menu-item-title'] == $original_title )
@@ -765 +769 @@
                 $menu_item->classes = array();
                 $menu_item->xfn = '';
 
+        } elseif ( isset( $menu_item->is_archive ) ) {
+                $menu_item->ID = $menu_item->name;
+                $menu_item->db_id = 0;
+                $menu_item->menu_item_parent = 0;
+                $menu_item->object_id = $menu_item->name;
+                $menu_item->type = 'archive';
+                $menu_item->object = $menu_item->name;
+                $menu_item->type_label = __( 'Post Type Archive' );
+                $menu_item->title = $menu_item->labels->name;
+                $menu_item->url = get_post_type_archive_link( $menu_item->name );
+                $menu_item->target = '';
+                $menu_item->attr_title = '';
+                $menu_item->description = '';
+                $menu_item->classes = array();
+                $menu_item->xfn = '';
         }
 
         /**