Changeset 15257

Timestamp:

06/14/2010 09:19:55 PM (15 years ago)

Author:

ryan

Message:

Menu ancestor fixes. Props filosofo. fixes #12812

File:

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

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

@@ -249 +249 @@
 
     $active_object = '';
+    $active_ancestor_item_ids = array();
     $active_parent_item_ids = array();
     $active_parent_object_ids = array();
@@ -328 +329 @@
         ) {
             $classes[] = 'current-menu-item';
+            $_anc_id = (int) $menu_item->db_id;
+
+            while( 
+                ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) && 
+                ! in_array( $_anc_id, $active_ancestor_item_ids ) 
+            ) {
+                $active_ancestor_item_ids[] = $_anc_id;
+            }
+
             if ( 'post_type' == $menu_item->type && 'page' == $menu_item->object ) {
                 // Back compat classes for pages to match wp_page_menu()
@@ -344 +354 @@
             if ( $item_url == $current_url ) {
                 $classes[] = 'current-menu-item';
+                $_anc_id = (int) $menu_item->db_id;
+
+                while( 
+                    ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) && 
+                    ! in_array( $_anc_id, $active_ancestor_item_ids ) 
+                ) {
+                    $active_ancestor_item_ids[] = $_anc_id;
+                }
+
                 if ( untrailingslashit($current_url) == home_url() ) {
                     $classes[] = 'menu-item-home';
@@ -361 +380 @@
         $menu_items[$key]->classes = array_unique( $classes );
     }
-
+    $active_ancestor_item_ids = array_filter( array_unique( $active_ancestor_item_ids ) );
     $active_parent_item_ids = array_filter( array_unique( $active_parent_item_ids ) );
     $active_parent_object_ids = array_filter( array_unique( $active_parent_object_ids ) );
@@ -389 +408 @@
         ) {
             $classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
+        }
+
+        if ( in_array(  intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
             $classes[] = 'current-menu-ancestor';
         }
-
         if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
             $classes[] = 'current-menu-parent';