<!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>[15221] trunk/wp-includes/nav-menu-template.php:
add ancestor classes for taxonomy objects, props filosofo, fixes #13831</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15221">15221</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-06-11 16:00:29 +0000 (Fri, 11 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add ancestor classes for taxonomy objects, props filosofo, fixes <a href="http://trac.wordpress.org/ticket/13831">#13831</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 (15220 => 15221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-06-11 15:53:41 UTC (rev 15220)
+++ trunk/wp-includes/nav-menu-template.php 2010-06-11 16:00:29 UTC (rev 15221)
</span><span class="lines">@@ -250,19 +250,58 @@
</span><span class="cx"> $active_object = '';
</span><span class="cx"> $active_parent_item_ids = array();
</span><span class="cx"> $active_parent_object_ids = array();
</span><ins>+ $possible_taxonomy_ancestors = array();
</ins><span class="cx"> $possible_object_parents = array();
</span><span class="cx"> $home_page_id = (int) get_option( 'page_for_posts' );
</span><span class="cx">
</span><span class="cx"> if ( $wp_query->is_singular && ! empty( $queried_object->post_type ) && ! is_post_type_hierarchical( $queried_object->post_type ) ) {
</span><span class="cx"> foreach ( (array) get_object_taxonomies( $queried_object->post_type ) as $taxonomy ) {
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><ins>+ $term_hierarchy = _get_term_hierarchy( $taxonomy );
</ins><span class="cx"> $terms = wp_get_object_terms( $queried_object_id, $taxonomy, array( 'fields' => 'ids' ) );
</span><del>- if ( is_array( $terms ) )
</del><ins>+ if ( is_array( $terms ) ) {
</ins><span class="cx"> $possible_object_parents = array_merge( $possible_object_parents, $terms );
</span><ins>+ $term_to_ancestor = array();
+ foreach ( (array) $term_hierarchy as $anc => $descs ) {
+ foreach ( (array) $descs as $desc )
+ $term_to_ancestor[ $desc ] = $anc;
+ }
+
+ foreach ( $terms as $desc ) {
+ do {
+ $possible_taxonomy_ancestors[ $taxonomy ][] = $desc;
+ if ( isset( $term_to_ancestor[ $desc ] ) ) {
+ $_desc = $term_to_ancestor[ $desc ];
+ unset( $term_to_ancestor[ $desc ] );
+ $desc = $_desc;
+ } else {
+ $desc = 0;
+ }
+ } while ( ! empty( $desc ) );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } elseif ( ! empty( $queried_object->post_type ) && is_post_type_hierarchical( $queried_object->post_type ) ) {
</span><span class="cx"> _get_post_ancestors( $queried_object );
</span><ins>+ } elseif ( ! empty( $queried_object->taxonomy ) && is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
+ $term_hierarchy = _get_term_hierarchy( $queried_object->taxonomy );
+ $term_to_ancestor = array();
+ foreach ( (array) $term_hierarchy as $anc => $descs ) {
+ foreach ( (array) $descs as $desc )
+ $term_to_ancestor[ $desc ] = $anc;
+ }
+ $desc = $queried_object->term_id;
+ do {
+ $possible_taxonomy_ancestors[ $queried_object->taxonomy ][] = $desc;
+ if ( isset( $term_to_ancestor[ $desc ] ) ) {
+ $_desc = $term_to_ancestor[ $desc ];
+ unset( $term_to_ancestor[ $desc ] );
+ $desc = $_desc;
+ } else {
+ $desc = 0;
+ }
+ } while ( ! empty( $desc ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $possible_object_parents = array_filter( $possible_object_parents );
</span><span class="lines">@@ -331,14 +370,27 @@
</span><span class="cx">
</span><span class="cx"> if (
</span><span class="cx"> isset( $parent_item->type ) &&
</span><del>- 'post_type' == $parent_item->type &&
- ! empty( $queried_object->post_type ) &&
- is_post_type_hierarchical( $queried_object->post_type ) &&
- in_array( $parent_item->object_id, $queried_object->ancestors )
</del><ins>+ (
+ // ancestral post object
+ (
+ 'post_type' == $parent_item->type &&
+ ! empty( $queried_object->post_type ) &&
+ is_post_type_hierarchical( $queried_object->post_type ) &&
+ in_array( $parent_item->object_id, $queried_object->ancestors )
+ ) ||
+
+ // ancestral term
+ (
+ 'taxonomy' == $parent_item->type &&
+ isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
+ in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+ )
+ )
</ins><span class="cx"> ) {
</span><del>- $classes[] = 'current-' . $queried_object->post_type . '-ancestor';
</del><ins>+ $classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
</ins><span class="cx"> $classes[] = 'current-menu-ancestor';
</span><span class="cx"> }
</span><ins>+
</ins><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>