Changeset 35382

Timestamp:

10/24/2015 05:45:11 PM (9 years ago)

Author:

wonderboymusic

Message:

Nav Menus: show custom post type Archive item at the top of the View All tab for the post type on the legacy Nav Menu screen.

Props aaroncampbell, DrewAPicture, seanchayes, hlashbrooke, paulwilde, ericlewis, raulillana
See #16075.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-walker-nav-menu-edit.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (2 diffs)
• wp-includes/post-functions.php (modified) (3 diffs)

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

@@ -1158 +1158 @@
                 case 'post_type' :
                     $_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;
 

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

@@ -79 +79 @@
             $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;
         }
 

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

@@ -494 +494 @@
                 }
 
+                $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

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

@@ -579 +579 @@
             $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'] ) ) {

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

@@ -404 +404 @@
             $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;
         }
 
@@ -732 +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 );

trunk/src/wp-includes/post-functions.php

@@ -1324 +1324 @@
  *                       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.
@@ -1363 +1364 @@
         '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' ) ),
@@ -1428 +1430 @@
     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();