Changeset 13362 for trunk/wp-admin/custom-navigation.php

Timestamp:

02/24/2010 06:41:35 AM (17 years ago)

Author:

ryan

Message:

Return menu object from wp_create_nav_menu(). Fix trailing separator in menu list. Disable menu delete because it deletes the current menu when a new menu is added. see #11817

File:

• trunk/wp-admin/custom-navigation.php (modified) (3 diffs)

trunk/wp-admin/custom-navigation.php

@@ -55 +55 @@
         $updated = true;
 }
+
 // Default Menu to show
-$custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+$custom_menus = wp_get_nav_menus();
 if ( ! $menu_selected_id && ! empty( $custom_menus ) )
         $menu_selected_id = $custom_menus[0]->term_id;
@@ -175 +176 @@
         <div id="pages-left">
                 <ul class="subsubsub">
-<?php                   if ( ! empty( $custom_menus ) ) {
+<?php           if ( ! empty( $custom_menus ) ) {
                                 foreach ( $custom_menus as $menu ) {
-                                        $menu_term = get_term( $menu, 'nav_menu' );
+                                        $sep = end($custom_menus) == $menu ? '' : ' | ';
+                                        // $menu_term = get_term( $menu, 'nav_menu' );
                                         if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) ) { ?>
-                        <li><?php echo esc_html( $menu_term->name ); ?> |</li>
-<?php                                   } else { ?>
-                        <li><a href='custom-navigation.php?edit_menu=<?php echo esc_attr($menu_term->term_id); ?>'><?php echo esc_html( $menu_term->name ); ?></a> |</li>
-<?php                                   }
+                                                <li><?php echo esc_html( $menu->name ) . $sep; ?></li>
+<?php                           } else { ?>
+                        <li><a href='custom-navigation.php?edit_menu=<?php echo esc_attr($menu->term_id); ?>'><?php echo esc_html( $menu->name ); ?></a><?php echo $sep; ?></li>
+<?php                           }
                                 }
                         } else { ?>
                         <li><?php _e( 'Default' ); ?></li>
-<?php                   } ?>
+<?php           } ?>
                 </ul>
                 <div class="clear"></div>
@@ -234 +236 @@
                         updatepostdata();
                 </script>
-
-                <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" />
+                <!-- <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" /> -->
                 <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
                 </div><!-- /.inside -->