Changeset 14758 for trunk/wp-admin/nav-menus.php

Timestamp:

05/20/2010 04:57:48 PM (16 years ago)

Author:

ryan

Message:

Make the next available tab active after deleting a tab. Props koopersmith. fixes #13338

File:

• trunk/wp-admin/nav-menus.php (modified) (2 diffs)

trunk/wp-admin/nav-menus.php

@@ -242 +242 @@
 
         if ( is_nav_menu( $nav_menu_selected_id ) ) {
+            $deleted_nav_menu = wp_get_nav_menu_object( $nav_menu_selected_id );
             $delete_nav_menu = wp_delete_nav_menu( $nav_menu_selected_id );
 
@@ -248 +249 @@
             } else {
                 $messages[] = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
-                $nav_menu_selected_id = 0; // Reset the selected menu
-                unset($_REQUEST['menu']);
-            }
-            unset( $delete_nav_menu );
+                // Select the next available menu
+                $nav_menu_selected_id = 0;
+                $_nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
+                foreach( $_nav_menus as $index => $_nav_menu ) {
+                    if ( strcmp( $_nav_menu->name, $deleted_nav_menu->name ) >= 0
+                     || $index == count( $_nav_menus ) - 1 ) {
+                        $nav_menu_selected_id = $_nav_menu->term_id;
+                        break;
+                    }
+                }
+            }
+            unset( $delete_nav_menu, $deleted_nav_menu, $_nav_menus );
+        } else {
+            // Reset the selected menu
+            $nav_menu_selected_id = 0;
+            unset( $_REQUEST['menu'] );
         }
         break;