Changeset 15100

Timestamp:

06/02/2010 05:10:31 AM (15 years ago)

Author:

nacin

Message:

Clear nav menu from menu locations on delete. Additional sanity checks. fixes #13690.

Location:

trunk/wp-admin

Files:

• includes/nav-menu.php (modified) (1 diff)
• nav-menus.php (modified) (4 diffs)

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

@@ -474 +474 @@
                 <span><?php echo $description; ?></span>
                 <select name="menu-locations[<?php echo $location; ?>]" id="locations-<?php echo $location; ?>">
-                    <option value=""></option>
+                    <option value="0"></option>
                     <?php foreach ( $menus as $menu ) : ?>
                     <option<?php selected( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $menu->term_id ); ?>

trunk/wp-admin/nav-menus.php

@@ -56 +56 @@
         check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
         if ( isset( $_REQUEST['nav-menu-locations'] ) )
-            set_theme_mod( 'nav_menu_locations', $_REQUEST['menu-locations'] );
+            set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
         elseif ( isset( $_REQUEST['menu-item'] ) )
             wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
@@ -234 +234 @@
 
 
-        if ( is_nav_menu_item( $menu_item_id ) ) {
-            if ( wp_delete_post( $menu_item_id, true ) ) {
-
-                $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
-            }
-        }
+        if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
+            $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
         break;
     case 'delete':
@@ -251 +247 @@
                 $messages[] = '<div id="message" class="error"><p>' . $delete_nav_menu->get_error_message() . '</p></div>';
             } else {
+                // Remove this menu from any locations.
+                $locations = get_theme_mod( 'nav_menu_locations' );
+                foreach ( $locations as $location => $menu_id ) {
+                    if ( $menu_id == $nav_menu_selected_id )
+                        $locations[ $location ] = 0;
+                }
+                set_theme_mod( 'nav_menu_locations', $locations );
                 $messages[] = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
                 // Select the next available menu
@@ -276 +279 @@
         // Update menu theme locations
         if ( isset( $_POST['menu-locations'] ) )
-            set_theme_mod( 'nav_menu_locations', $_POST['menu-locations'] );
+            set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
 
         // Add Menu