Changeset 16105

Timestamp:

10/30/2010 10:41:52 PM (16 years ago)

Author:

scribu

Message:

Fix regression introduced by [16096]. Props duck_. See #14415

File:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -747 +747 @@
         // The following is a hacky way to restore them when adding non-custom items.
 
-        $menu_items_data = (array) $_POST['menu-item'];
-        $menu_item_data = array_shift( $menu_items_data ); 
-        if ( 
-                ! empty( $menu_item_data['menu-item-type'] ) && 
-                'custom' != $menu_item_data['menu-item-type'] &&
-                ! empty( $menu_item_data['menu-item-object-id'] )
-        ) {
-                switch( $menu_item_data['menu-item-type'] ) {
-                        case 'post_type' :
-                                $_object = get_post( $menu_item_data['menu-item-object-id'] );
-                        break;
-
-                        case 'taxonomy' :
-                                $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] ); 
-                        break;
-                }
-
-                $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) ); 
-                $_menu_item = array_shift( $_menu_items );
-
-                // Restore the missing menu item properties
-                $menu_item_data['menu-item-description'] = $_menu_item->description;
-        }
-
-        $menu_items_data = array( $menu_item_data );
+        $menu_items_data = array();
+        foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
+                if (
+                        ! empty( $menu_item_data['menu-item-type'] ) && 
+                        'custom' != $menu_item_data['menu-item-type'] &&
+                        ! empty( $menu_item_data['menu-item-object-id'] )
+                ) {
+                        switch( $menu_item_data['menu-item-type'] ) {
+                                case 'post_type' :
+                                        $_object = get_post( $menu_item_data['menu-item-object-id'] );
+                                break;
+
+                                case 'taxonomy' :
+                                        $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] ); 
+                                break;
+                        }
+
+                        $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) ); 
+                        $_menu_item = array_shift( $_menu_items );
+
+                        // Restore the missing menu item properties
+                        $menu_item_data['menu-item-description'] = $_menu_item->description;
+                }
+                
+                $menu_items_data[] = $menu_item_data;
+        }       
 
         $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );