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

Timestamp:

03/16/2010 10:01:49 PM (17 years ago)

Author:

ryan

Message:

Menu item -> append should be a key/name, not a label. see #11817

File:

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

trunk/wp-includes/nav-menu.php

@@ -172 +172 @@
                         $menu_item->parent_id = (int) $menu_item->post_parent;
                         $menu_item->type = get_post_meta( $menu_item->ID, 'menu_item_type', true );
-                        $menu_item->append = _x( get_post_meta( $menu_item->ID, 'menu_item_append', true ), 'nav menu item type' );
+
+                        $menu_item->append = get_post_meta( $menu_item->ID, 'menu_item_append', true );
                         
                         $menu_item->title = $menu_item->post_title;
@@ -191 +192 @@
                         $menu_item->parent_id = (int) $menu_item->post_parent;
                         $menu_item->type = 'custom'; //$menu_item_type
-                        $menu_item->append = _x( 'Custom', 'nav menu item type' );
+                        $menu_item->append = 'custom';
                         
                         $menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
@@ -208 +209 @@
                         
                         $object = get_post_type_object( $menu_item_object );
-                        $menu_item->append = _x( $object->singular_label, 'nav menu item type' );
+                        $menu_item->append = $object->name;
 
                         $menu_item->title = $menu_item->post_title;
@@ -226 +227 @@
                         
                         $object = get_taxonomy( $menu_item_object );
-                        $menu_item->append = _x( $object->singular_label, 'nav menu item type' );
+                        $menu_item->append = $object->name;
 
                         $menu_item->title = $menu_item->name;
@@ -235 +236 @@
                         break;
         }
-        
+
         $menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );
         $menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );