Changeset 14031 for trunk/wp-includes/nav-menu.php

Timestamp:

04/07/2010 03:25:48 PM (16 years ago)

Author:

ryan

Message:

Nav menu fixes. Props ptahdunbar. see #12896 fixes #12844

File:

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

trunk/wp-includes/nav-menu.php

@@ -179 +179 @@
     $args = array( $items, $depth, $r );
 
-    return call_user_func_array(array(&$walker, 'walk'), $args);
+    return call_user_func_array( array(&$walker, 'walk'), $args );
 }
 
@@ -203 +203 @@
                 $object = get_post_type_object( $menu_item->object );
                 $menu_item->append = $object->singular_label;
+                $menu_item->url = get_permalink( $menu_item->object_id );
 
             } elseif ( 'taxonomy' == $menu_item->type ) {
                 $object = get_taxonomy( $menu_item->object );
                 $menu_item->append = $object->singular_label;
+                $menu_item->url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
 
             } else {
                 $menu_item->append = __('Custom');
+                $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
             }
 
             $menu_item->title = $menu_item->post_title;
-            $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
             $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );
 
@@ -222 +224 @@
             $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true );
             break;
-
+        
         case 'custom':
             $menu_item->db_id = 0;
@@ -236 +238 @@
             $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
             $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );
-            $menu_item->classes = '';
-            $menu_item->xfn = '';
+            $menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_target', true );
+            $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true );
             break;
 
@@ -274 +276 @@
             $menu_item->target = '';
             $menu_item->attr_title = '';
-            $menu_item->description = strip_tags( $menu_item->description );
+            $menu_item->description = '';
             $menu_item->classes = '';
             $menu_item->xfn = '';
             break;
     }
-    return $menu_item;
+    
+    return apply_filters( 'wp_setup_nav_menu_item', $menu_item, $menu_item_type, $menu_item_object );
 }
 ?>