From ec0823ce3e372a89d8159869bd1772c0d318c038 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 23 May 2010 22:01:08 +0000 Subject: [PATCH] Proper checks for current-menu-item. props duck_, fixes #13409. git-svn-id: https://develop.svn.wordpress.org/trunk@14824 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/nav-menu-template.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 4ee31036f3..da2d327072 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -79,7 +79,11 @@ class Walker_Nav_Menu extends Walker { $classes[] = 'current-menu-item'; } else { $classes[] = 'menu-item-object-'. $item->object; - if ( $item->object_id == $wp_query->get_queried_object_id() ) + if ( + $item->object_id == $wp_query->get_queried_object_id() && + ( ( 'post_type' == $item->type && $wp_query->is_singular ) || + ( 'taxonomy' == $item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) ) ) + ) $classes[] = 'current-menu-item'; }