Changeset 16731

Timestamp:

12/05/2010 04:29:56 AM (16 years ago)

Author:

nacin

Message:

Check that ancestors are not the currently queried objects in nav menu classes. props filosofo, fixes #14518.

File:

• trunk/wp-includes/nav-menu-template.php (modified) (2 diffs)

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

@@ -412 +412 @@
                                         ! empty( $queried_object->post_type ) &&
                                         is_post_type_hierarchical( $queried_object->post_type ) &&
-                                        in_array( $parent_item->object_id, $queried_object->ancestors )
+                                        in_array( $parent_item->object_id, $queried_object->ancestors ) &&
+                                        $parent_item->object != $queried_object->ID
                                 ) ||
 
@@ -419 +420 @@
                                         'taxonomy' == $parent_item->type &&
                                         isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
-                                        in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+                                        in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
+                                        $parent_item->object_id != $queried_object->term_id
                                 )
                         )