From d956d4ba272c98e378d95ed12292c28a251b05a8 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 11 Jun 2010 16:00:29 +0000
Subject: [PATCH] add ancestor classes for taxonomy objects, props filosofo,
 fixes #13831

git-svn-id: http://svn.automattic.com/wordpress/trunk@15221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/nav-menu-template.php | 64 ++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 616c29475..f54c99854 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -250,19 +250,58 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 	$active_object = '';
 	$active_parent_item_ids = array();
 	$active_parent_object_ids = array();
+	$possible_taxonomy_ancestors = array();
 	$possible_object_parents = array();
 	$home_page_id = (int) get_option( 'page_for_posts' );
 
 	if ( $wp_query->is_singular && ! empty( $queried_object->post_type ) && ! is_post_type_hierarchical( $queried_object->post_type ) ) {
 		foreach ( (array) get_object_taxonomies( $queried_object->post_type ) as $taxonomy ) {
 			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+				$term_hierarchy = _get_term_hierarchy( $taxonomy );
 				$terms = wp_get_object_terms( $queried_object_id, $taxonomy, array( 'fields' => 'ids' ) );
-				if ( is_array( $terms ) )
+				if ( is_array( $terms ) ) {
 					$possible_object_parents = array_merge( $possible_object_parents, $terms );
+					$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 ) );
+					}
+				}
 			}
 		}
 	} elseif ( ! empty( $queried_object->post_type ) && is_post_type_hierarchical( $queried_object->post_type ) ) {
 		_get_post_ancestors( $queried_object );
+	} 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 ) );
 	}
 
 	$possible_object_parents = array_filter( $possible_object_parents );
@@ -331,14 +370,27 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 		if (
 			isset( $parent_item->type ) &&
-			'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 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 ] )
+				)
+			)
 		) {
-			$classes[] = 'current-' . $queried_object->post_type . '-ancestor';
+			$classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
 			$classes[] = 'current-menu-ancestor';
 		}
+
 		if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
 			$classes[] = 'current-menu-parent';
 		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )