Changeset 22302 for trunk/wp-includes/nav-menu-template.php

Timestamp:

10/25/2012 08:32:01 PM (12 years ago)

Author:

nacin

Message:

Confirm that the nav menu's underlying object is in the proper taxonomy before adding the current-menu-item class. props SergeyBiryukov. fixes #21369.

File:

• trunk/wp-includes/nav-menu-template.php (modified) (1 diff)

trunk/wp-includes/nav-menu-template.php

@@ -338 +338 @@
                 ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && $wp_query->is_home && $home_page_id == $menu_item->object_id ) ||
                 ( 'post_type' == $menu_item->type && $wp_query->is_singular ) ||
-                ( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) )
+                ( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
             )
         ) {