<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15257] trunk/wp-includes/nav-menu-template.php: Menu ancestor fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15257">15257</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-14 21:19:55 +0000 (Mon, 14 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Menu ancestor fixes. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/12812">#12812</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (15256 => 15257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-06-14 20:50:55 UTC (rev 15256)
+++ trunk/wp-includes/nav-menu-template.php 2010-06-14 21:19:55 UTC (rev 15257)
</span><span class="lines">@@ -248,6 +248,7 @@
</span><span class="cx"> $queried_object_id = (int) $wp_query->queried_object_id;
</span><span class="cx">
</span><span class="cx"> $active_object = '';
</span><ins>+ $active_ancestor_item_ids = array();
</ins><span class="cx"> $active_parent_item_ids = array();
</span><span class="cx"> $active_parent_object_ids = array();
</span><span class="cx"> $possible_taxonomy_ancestors = array();
</span><span class="lines">@@ -327,6 +328,15 @@
</span><span class="cx"> )
</span><span class="cx"> ) {
</span><span class="cx"> $classes[] = 'current-menu-item';
</span><ins>+ $_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;
+ }
+
</ins><span class="cx"> if ( 'post_type' == $menu_item->type && 'page' == $menu_item->object ) {
</span><span class="cx"> // Back compat classes for pages to match wp_page_menu()
</span><span class="cx"> $classes[] = 'page_item';
</span><span class="lines">@@ -343,6 +353,15 @@
</span><span class="cx"> $item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
</span><span class="cx"> if ( $item_url == $current_url ) {
</span><span class="cx"> $classes[] = 'current-menu-item';
</span><ins>+ $_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;
+ }
+
</ins><span class="cx"> if ( untrailingslashit($current_url) == home_url() ) {
</span><span class="cx"> $classes[] = 'menu-item-home';
</span><span class="cx"> // Back compat for home limk to match wp_page_menu()
</span><span class="lines">@@ -360,7 +379,7 @@
</span><span class="cx">
</span><span class="cx"> $menu_items[$key]->classes = array_unique( $classes );
</span><span class="cx"> }
</span><del>-
</del><ins>+ $active_ancestor_item_ids = array_filter( array_unique( $active_ancestor_item_ids ) );
</ins><span class="cx"> $active_parent_item_ids = array_filter( array_unique( $active_parent_item_ids ) );
</span><span class="cx"> $active_parent_object_ids = array_filter( array_unique( $active_parent_object_ids ) );
</span><span class="cx">
</span><span class="lines">@@ -388,9 +407,11 @@
</span><span class="cx"> )
</span><span class="cx"> ) {
</span><span class="cx"> $classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
</span><ins>+ }
+
+ if ( in_array( intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
</ins><span class="cx"> $classes[] = 'current-menu-ancestor';
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
</span><span class="cx"> $classes[] = 'current-menu-parent';
</span><span class="cx"> if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
</span></span></pre>
</div>
</div>
</body>
</html>