Ticket #13409: 13409.diff

wp-includes/nav-menu-template.php

@@ -79 +79 @@
                                 $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() &&
+                                (( $item->type == 'post_type' && ( $wp_query->is_single || $wp_query->is_page ) ) ||
+                                ( $item->type == 'taxonomy' && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ))) 
+                        )
                                 $classes[] = 'current-menu-item';
                 }