<!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>[41008] trunk: Menus: Make sure `current-menu-parent` and `current-menu-ancestor` classes are properly set for parent items of post type archive submenu items.</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/41008">41008</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/41008","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-05 21:30:30 +0000 (Wed, 05 Jul 2017)</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'>Menus: Make sure `current-menu-parent` and `current-menu-ancestor` classes are properly set for parent items of post type archive submenu items.
Props mrwweb, ajoah, welcher.
Fixes <a href="https://core.trac.wordpress.org/ticket/39800">#39800</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2017-07-05 18:54:56 UTC (rev 41007)
+++ trunk/src/wp-includes/nav-menu-template.php 2017-07-05 21:30:30 UTC (rev 41008)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,6 +394,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current-menu-item';
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items[$key]->current = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_anc_id = (int) $menu_item->db_id;
+
+ while(
+ ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
+ ! in_array( $_anc_id, $active_ancestor_item_ids )
+ ) {
+ $active_ancestor_item_ids[] = $_anc_id;
+ }
+
+ $active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
+
</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="trunktestsphpunittestspostnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2017-07-05 18:54:56 UTC (rev 41007)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2017-07-05 21:30:30 UTC (rev 41008)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,4 +553,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Post', get_post( $nav_created_post_ids[0] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Post', get_post( $nav_created_post_ids[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 39800
+ */
+ function test_parent_ancestor_for_post_archive() {
+
+ register_post_type( 'books', array( 'label' => 'Books', 'public' => true, 'has_archive' => true ) );
+
+ $first_page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Top Level Page' ) );
+ $second_page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Second Level Page' ) );
+
+
+ $first_menu_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type',
+ 'menu-item-object' => 'page',
+ 'menu-item-object-id' => $first_page_id,
+ 'menu-item-status' => 'publish',
+ ));
+
+ $second_menu_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type',
+ 'menu-item-object' => 'page',
+ 'menu-item-object-id' => $second_page_id,
+ 'menu-item-status' => 'publish',
+ 'menu-item-parent-id' => $first_menu_id
+ ));
+
+ wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type_archive',
+ 'menu-item-object' => 'books',
+ 'menu-item-status' => 'publish',
+ 'menu-item-parent-id' => $second_menu_id
+ ));
+
+ $this->go_to( get_post_type_archive_link( 'books' ) );
+
+ $menu_items = wp_get_nav_menu_items( $this->menu_id );
+ _wp_menu_item_classes_by_context( $menu_items );
+
+ $top_page_menu_item = $menu_items[0];
+ $secondary_page_menu_item = $menu_items[1];
+ $post_archive_menu_item = $menu_items[2];
+
+ $this->assertFalse( $top_page_menu_item->current_item_parent );
+ $this->assertTrue( $top_page_menu_item->current_item_ancestor );
+ $this->assertContains( 'current-menu-ancestor', $top_page_menu_item->classes );
+
+ $this->assertTrue( $secondary_page_menu_item->current_item_parent );
+ $this->assertTrue( $secondary_page_menu_item->current_item_ancestor );
+ $this->assertContains( 'current-menu-parent', $secondary_page_menu_item->classes );
+ $this->assertContains( 'current-menu-ancestor', $secondary_page_menu_item->classes );
+
+ $this->assertFalse( $post_archive_menu_item->current_item_parent );
+ $this->assertFalse( $post_archive_menu_item->current_item_ancestor );
+
+ $this->assertNotContains( 'current-menu-parent', $post_archive_menu_item->classes );
+ $this->assertNotContains( 'current-menu-ancestor', $post_archive_menu_item->classes );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>