Ticket #16075: 16075.7.diff

src/wp-admin/includes/ajax-actions.php

@@ -1158 +1158 @@
                                         $_object = get_post( $menu_item_data['menu-item-object-id'] );
                                 break;
 
+                                case 'post_type_archive' :
+                                        $_object = get_post_type_object( $menu_item_data['menu-item-object'] );
+                                break;
+
                                 case 'taxonomy' :
                                         $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
                                 break;

src/wp-admin/includes/class-walker-nav-menu-edit.php

@@ -78 +78 @@
                 } elseif ( 'post_type' == $item->type ) {
                         $original_object = get_post( $item->object_id );
                         $original_title = get_the_title( $original_object->ID );
+                } elseif ( 'post_type_archive' == $item->type ) {
+                        $original_object = get_post_type_object( $item->object );
+                        $original_title = $original_object->labels->archives;
                 }
 
                 $classes = array(

src/wp-admin/includes/nav-menu.php

@@ -493 +493 @@
                                         }
                                 }
 
+                                $post_type = get_post_type_object( $post_type_name );
+                                $archive_link = get_post_type_archive_link( $post_type_name );
+                                if ( $post_type->has_archive ) {
+                                        $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
+                                        array_unshift( $posts, (object) array(
+                                                'ID' => 0,
+                                                'object_id' => $_nav_menu_placeholder,
+                                                'object'     => $post_type_name,
+                                                'post_content' => '',
+                                                'post_excerpt' => '',
+                                                'post_title' => $post_type->labels->archives,
+                                                'post_type' => 'nav_menu_item',
+                                                'type' => 'post_type_archive',
+                                                'url' => get_post_type_archive_link( $post_type_name ),
+                                        ) );
+                                }
+
                                 /**
                                  * Filter the posts displayed in the 'View All' tab of the current
                                  * post type's menu items meta box.

src/wp-includes/nav-menu-template.php

@@ -578 +578 @@
                         $active_parent_object_ids[] = (int) $menu_item->post_parent;
                         $active_object = $menu_item->object;
 
+                // if the menu item corresponds to the currently-queried post type archive
+                } elseif (
+                        'post_type_archive' == $menu_item->type &&
+                        is_post_type_archive( array( $menu_item->object ) )
+                ) {
+                        $classes[] = 'current-menu-item';
+                        $menu_items[$key]->current = true;
                 // if the menu item corresponds to the currently-requested URL
                 } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
                         $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );

src/wp-includes/nav-menu.php

@@ -403 +403 @@
                         $original_object = get_post( $args['menu-item-object-id'] );
                         $original_parent = (int) $original_object->post_parent;
                         $original_title = $original_object->post_title;
+                } elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
+
+                        $original_object = get_post_type_object( $args['menu-item-object'] );
+                        $original_title = $original_object->labels->archives;
                 }
 
                 if ( $args['menu-item-title'] == $original_title )
@@ -731 +735 @@
 
                                 $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
+                        } elseif ( 'post_type_archive' == $menu_item->type ) {
+                                $object =  get_post_type_object( $menu_item->object );
+                                if ( $object ) {
+                                        $menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
+                                } else {
+                                        $menu_item->_invalid = true;
+                                }
+
+                                $menu_item->type_label = __( 'Post Type Archive' );
+                                $menu_item->description = '';
+                                $menu_item->url = get_post_type_archive_link( $menu_item->object );
                         } elseif ( 'taxonomy' == $menu_item->type ) {
                                 $object = get_taxonomy( $menu_item->object );
                                 if ( $object ) {

src/wp-includes/post-functions.php

@@ -1315 +1315 @@
  * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical
  *                       ones the default is 'Parent Page:'.
  * - all_items - String for the submenu. Default is All Posts/All Pages.
+ * - archives - String for use with archives in nav menus. Default is Post Archives/Page Archives.
  * - insert_into_item - String for the media frame button. Default is Insert into post/Insert into page.
  * - uploaded_to_this_item - String for the media frame filter. Default is Uploaded to this post/Uploaded to this page.
  * - featured_image - Default is Featured Image.
@@ -1353 +1354 @@
                 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
                 'parent_item_colon' => array( null, __('Parent Page:') ),
                 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
+                'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
                 'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
                 'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
                 'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ),
@@ -1419 +1421 @@
         if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
                 $object->labels['all_items'] = $object->labels['menu_name'];
 
+        if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+                $object->labels['archives'] = $object->labels['all_items'];
+        }
+
         $defaults = array();
         foreach ( $nohier_vs_hier_defaults as $key => $value ) {
                 $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];