From 231be648019b031281699d28bced2c08198c76df Mon Sep 17 00:00:00 2001 From: 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: http://svn.automattic.com/wordpress/trunk@14824 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- 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 4ee31036f..da2d32707 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'; }