Changeset 23897

Timestamp:

04/04/2013 04:28:12 AM (13 years ago)

Author:

nacin

Message:

Remove _wp_delete_nav_menu(). wp_delete_nav_menu() should instead remove the menu from theme locations, which was the only difference between the functions. see #23119.

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-includes/nav-menu.php (modified) (1 diff)

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

@@ -1207 +1207 @@
 
 /**
- * Delete nav menus from the nav menu management screen
- *
- * @since 3.6.0
- * @access private
- *
- * @param int|string $nav_menu_id The menu to delete (id, slug, or name)
- * @return false if Error, otherwise true
- */
-function _wp_delete_nav_menu( $nav_menu_id ) {
-
-    if ( ! is_nav_menu( $nav_menu_id ) )
-        return;
-
-    $deleted_nav_menu = wp_get_nav_menu_object( $nav_menu_id );
-    $delete_nav_menu = wp_delete_nav_menu( $nav_menu_id );
-
-    if ( is_wp_error( $delete_nav_menu ) )
-        return $delete_nav_menu;
-
-    // Remove this menu from any locations.
-    $locations = get_theme_mod( 'nav_menu_locations' );
-    foreach ( (array) $locations as $location => $menu_id ) {
-        if ( $menu_id == $nav_menu_id )
-            $locations[ $location ] = 0;
-    }
-    set_theme_mod( 'nav_menu_locations', $locations );
-    return true;
-}
-
-/**
  * Saves nav menu items
  *

trunk/wp-admin/nav-menus.php

@@ -232 +232 @@
         check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
         if ( is_nav_menu( $nav_menu_selected_id ) ) {
-            $deletion = _wp_delete_nav_menu( $nav_menu_selected_id );
+            $deletion = wp_delete_nav_menu( $nav_menu_selected_id );
         } else {
             // Reset the selected menu
@@ -254 +254 @@
                 continue;
 
-            $deletion = _wp_delete_nav_menu( $menu_id_to_delete );
+            $deletion = wp_delete_nav_menu( $menu_id_to_delete );
             if ( is_wp_error( $deletion ) ) {
                 $messages[] = '<div id="message" class="error"><p>' . $deletion->get_error_message() . '</p></div>';

trunk/wp-includes/nav-menu.php

@@ -189 +189 @@
 
     $result = wp_delete_term( $menu->term_id, 'nav_menu' );
+
+    // Remove this menu from any locations.
+    $locations = get_theme_mod( 'nav_menu_locations' );
+    foreach ( (array) $locations as $location => $menu_id ) {
+        if ( $menu_id == $nav_menu_id )
+            $locations[ $location ] = 0;
+    }
+    set_theme_mod( 'nav_menu_locations', $locations );
 
     if ( $result && !is_wp_error($result) )