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

Timestamp:

02/21/2010 06:24:41 PM (17 years ago)

Author:

ryan

Message:

Use nav_menu as the taxonomy name and nav_menu_item as the post type. Set object_id in postmeta. see #11817

File:

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

trunk/wp-admin/custom-navigation.php

@@ -65 +65 @@
 
         // Default Menu to show
-        $custom_menus = get_terms( 'menu', array( 'hide_empty' => false ) );
+        $custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
         if ( !empty( $custom_menus ) )
                 $menu_selected_id = $custom_menus[0]->term_id;
@@ -95 +95 @@
 
                 if ( $insert_menu_name != '' ) {
-                        $existing_term = get_term_by( 'name', $insert_menu_name, 'menu' );
+                        $existing_term = get_term_by( 'name', $insert_menu_name, 'nav_menu' );
                         if ( $existing_term ) {
-                                $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . $insert_menu_name . ' Menu has already created - please try another name</p></div>';
+                                $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . $existing_term->name . ' Menu has already created - please try another name</p></div>';
                         } else {
-                                $term = wp_insert_term( $insert_menu_name, 'menu' );
+                                $term = wp_insert_term( $insert_menu_name, 'nav_menu' );
                                 if ( !is_wp_error($term) ) {
-                                        $term = get_term($term['term_id'], 'menu');
+                                        $term = get_term($term['term_id'], 'nav_menu');
                                         $custom_menus[$term->term_id] = $term;
                                         $menu_selected_id = $term->term_id;
@@ -128 +128 @@
             }
         } elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
-                $menu_objects = get_objects_in_term( $menu_selected_id, 'menu' );
+                $menu_objects = get_objects_in_term( $menu_selected_id, 'nav_menu' );
                 $menu_items = wp_custom_navigation_get_menu_items( $menu_objects );
 
@@ -134 +134 @@
                 for ( $k = 1; $k <= $postCounter; $k++ ) {
                         if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
-                        if (isset($_POST['postmenu'.$k])) { $post_id = $_POST['postmenu'.$k]; } else { $post_id = 0; }
+                        if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
                         //@todo implement heirarchy
                         if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
@@ -147 +147 @@
                         if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
 
-                        $post = array( 'post_status' => 'publish', 'post_type' => 'menu_item', 'post_author' => $user_ID,
-                                'ping_status' => 0, 'post_parent' => $post_id, 'menu_order' => $position,
-                                'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'menu' => $menu_title ),
+                        $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
+                                'ping_status' => 0, 'post_parent' => 0, 'menu_order' => $position,
+                                'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'nav_menu' => $menu_title ),
                                 'post_content' => $custom_description, 'post_title' => $custom_title );
                         if ( $new_window )
@@ -158 +158 @@
                         // New menu item
                         if ( $db_id == 0 ) {
-                                $db_id = $post_id = wp_insert_post( $post );
+                                $db_id = wp_insert_post( $post );
                         } elseif ( isset( $menu_items[$db_id] ) ) {
                                 $post['ID'] = $db_id;
@@ -165 +165 @@
                         }
                         update_post_meta($db_id, 'menu_type', $linktype);
+                        update_post_meta($db_id, 'object_id', $object_id);
                 }
                 if ( !empty( $menu_items ) ) {
@@ -281 +282 @@
 
                                                 //DISPLAY SELECT OPTIONS
-                                                foreach( $custom_menus as $menu ) {
-                                                        $menu_term = get_term( $menu, 'menu' );
+                                                foreach ( $custom_menus as $menu ) {
+                                                        $menu_term = get_term( $menu, 'nav_menu' );
                                                         if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) )
                                                                 $selected_option = 'selected="selected"';