Changeset 14905

Timestamp:

05/25/2010 09:44:34 PM (14 years ago)

Author:

ryan

Message:

Menu notice and stlying fixes. Props filosofo. fixes #12812

Location:

trunk

Files:

• wp-content/themes/twentyten/style.css (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (2 diffs)

trunk/wp-content/themes/twentyten/style.css

@@ -432 +432 @@
 }
 #access ul li.current_page_item a ,
-#access ul li.current-menu-item a {
+#access ul li.current-menu-ancestor a,
+#access ul li.current-menu-item a,
+#access ul li.current-menu-parent a {
     color: #fff;
 }

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

@@ -82 +82 @@
                 $classes[] = 'page_item';
                 $classes[] = 'page-item-' . $item->object_id;
-                if ( !empty($item->classes) ) {
+                if ( ! empty( $item->classes ) ) {
                     if ( in_array('current-menu-item', $classes) )
                         $classes[] = 'current_page_item';
@@ -362 +362 @@
     // set parent's class
     foreach ( (array) $menu_items as $key => $parent_item ) {
-        if ( 'post_type' == $parent_item->type && is_post_type_hierarchical( $queried_object->post_type ) && in_array( $parent_item->object_id, $queried_object->ancestors ) )
-            $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-' . $queried_object->post_type . '-ancestor' );
+        if ( 
+            isset( $parent_item->type ) && 
+            'post_type' == $parent_item->type && 
+            ! empty( $queried_object->post_type ) &&
+            is_post_type_hierarchical( $queried_object->post_type ) && 
+            in_array( $parent_item->object_id, $queried_object->ancestors )
+        )
+            $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-' . $queried_object->post_type . '-ancestor current-menu-ancestor' );
         if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
             $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-menu-parent' );