<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35382] trunk/src: 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.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35382">35382</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35382","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-24 17:45:11 +0000 (Sat, 24 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/16075">#16075</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespostfunctionsphp">trunk/src/wp-includes/post-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1159,6 +1159,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_object = get_post( $menu_item_data['menu-item-object-id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'post_type_archive' :
+ $_object = get_post_type_object( $menu_item_data['menu-item-object'] );
+ break;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'taxonomy' :
</span><span class="cx" style="display: block; padding: 0 10px"> $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post_type' == $item->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post( $item->object_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_the_title( $original_object->ID );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' == $item->type ) {
+ $original_object = get_post_type_object( $item->object );
+ $original_title = $original_object->labels->archives;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-admin/includes/nav-menu.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,6 +493,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 ),
+ ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the posts displayed in the 'View All' tab of the current
</span><span class="cx" style="display: block; padding: 0 10px"> * post type's menu items meta box.
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu-template.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-includes/nav-menu-template.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,6 +578,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $active_parent_object_ids[] = (int) $menu_item->post_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $active_object = $menu_item->object;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> // if the menu item corresponds to the currently-requested URL
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-includes/nav-menu.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,6 +403,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post( $args['menu-item-object-id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $original_parent = (int) $original_object->post_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->post_title;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
+ $original_object = get_post_type_object( $args['menu-item-object'] );
+ $original_title = $original_object->labels->archives;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['menu-item-title'] == $original_title )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,6 +734,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'taxonomy' == $menu_item->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $object = get_taxonomy( $menu_item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object ) {
</span></span></pre></div>
<a id="trunksrcwpincludespostfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-functions.php 2015-10-24 14:41:19 UTC (rev 35381)
+++ trunk/src/wp-includes/post-functions.php 2015-10-24 17:45:11 UTC (rev 35382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1323,6 +1323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical
</span><span class="cx" style="display: block; padding: 0 10px"> * ones the default is 'Parent Page:'.
</span><span class="cx" style="display: block; padding: 0 10px"> * - all_items - String for the submenu. Default is All Posts/All Pages.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - archives - String for use with archives in nav menus. Default is Post Archives/Page Archives.
</ins><span class="cx" style="display: block; padding: 0 10px"> * - insert_into_item - String for the media frame button. Default is Insert into post/Insert into page.
</span><span class="cx" style="display: block; padding: 0 10px"> * - uploaded_to_this_item - String for the media frame filter. Default is Uploaded to this post/Uploaded to this page.
</span><span class="cx" style="display: block; padding: 0 10px"> * - featured_image - Default is Featured Image.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1362,6 +1363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_item_colon' => array( null, __('Parent Page:') ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,6 +1430,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $object->labels['all_items'] = $object->labels['menu_name'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+ $object->labels['archives'] = $object->labels['all_items'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $defaults = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $nohier_vs_hier_defaults as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
</span></span></pre>
</div>
</div>
</body>
</html>