Changeset 13722

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (9 diffs)
• wp-includes/nav-menu-template.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (5 diffs)

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

@@ -22 +22 @@
         if ( !in_array($post_type->name, $allowed_types) )
             continue;
-        $id = sanitize_title_with_dashes( $post_type->label );
-        
+        $id = $post_type->name;
+
         // delete_transient( "nav_menu_items_{$post_type->name}" );
         // delete_transient( "nav_menu_sub_items_{$post_type->name}" );
@@ -38 +38 @@
 function wp_nav_menu_taxonomy_metaboxes() {
     $taxonomies = get_taxonomies( array( 'show_ui' => true ), 'object' );
-    
+
     if ( !$taxonomies )
         return false;
@@ -46 +46 @@
         if ( !in_array($tax->name, $allowed_types) )
             continue;
-        $id = sanitize_title_with_dashes( $tax->label );
-
-        
+        $id = $tax->name;
+
         // delete_transient( "nav_menu_items_{$tax->name}" );
         // delete_transient( "nav_menu_sub_items_{$tax->name}" );
-        
+
         add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $tax->singular_label ), 'wp_nav_menu_item_taxonomy_metabox', 'menus', 'side', 'default', $tax );
     }
@@ -183 +182 @@
     }
     
-    $id = sanitize_title_with_dashes( $post_type['args']->label );
+    $id = $post_type['args']->name;
     ?>
     <p class="quick-search-wrap">
@@ -198 +197 @@
         <div class="list-container">
             <ul class="list">
-                <?php echo isset( $error ) ? $error : wp_nav_menu_get_items( $query->posts, 'post_type', $post_type['args']->name ); ?>
+                <?php echo isset( $error ) ? $error : wp_nav_menu_get_items( $query->posts, 'post_type', $id ); ?>
             </ul>
         </div><!-- /.list-container-->
@@ -205 +204 @@
         <a class="button-secondary"><?php _e('Add to Menu'); ?></a>
     </p>
-    <input type="hidden" class="autocomplete" name="autocomplete-<?php echo esc_attr( $post_type['args']->name ); ?>-names" value="<?php echo esc_js( $pt_names ); ?>" />
+    <input type="hidden" class="autocomplete" name="autocomplete-<?php echo esc_attr( $id ); ?>-names" value="<?php echo esc_js( $pt_names ); ?>" />
     <br class="clear" />
     <script type="text/javascript" charset="utf-8">
@@ -253 +252 @@
     }
     
-    $id = sanitize_title_with_dashes( $taxonomy['args']->label );
+    $id = $taxonomy['args']->name;
     ?>
     <p class="quick-search-wrap">
@@ -268 +267 @@
         <div class="list-container">
             <ul class="list">
-                <?php echo isset( $error ) ? $error : wp_nav_menu_get_items( $terms, 'taxonomy', $taxonomy['args']->name ); ?>
+                <?php echo isset( $error ) ? $error : wp_nav_menu_get_items( $terms, 'taxonomy', $id ); ?>
             </ul>
         </div><!-- /.list-container-->
@@ -275 +274 @@
         <a class="button-secondary"><?php _e('Add to Menu'); ?></a>
     </p>
-    <input type="hidden" class="autocomplete" name="autocomplete-<?php echo esc_attr($taxonomy['args']->name); ?>-names" value="<?php echo esc_js( $term_names ); ?>" />
+    <input type="hidden" class="autocomplete" name="autocomplete-<?php echo esc_attr($id); ?>-names" value="<?php echo esc_js( $term_names ); ?>" />
     <br class="clear" />
     <script type="text/javascript" charset="utf-8">

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

@@ -117 +117 @@
         $menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
 
-        $type = sanitize_title_with_dashes( $menu_item->append );
+        $type = $menu_item->append;
         $maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"';
         $classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : '';

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 );