Wordpress 3.7

[autoinstalls/wordpress.git] / wp-includes / nav-menu.php

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 794f4b2d1177f4d5658fc66bc0304d0ff008d9e8..cf9ac1427e5efd1b06d2460f88aefc2b70d6f1bf 100644 (file)
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -190,8 +190,8 @@ function wp_delete_nav_menu( $menu ) {
        $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 ) {
+       $locations = get_nav_menu_locations();
+       foreach ( $locations as $location => $menu_id ) {
                if ( $menu_id == $menu->term_id )
                        $locations[ $location ] = 0;
        }
@@ -476,8 +476,6 @@ function _is_valid_nav_menu_item( $item ) {
  * @return mixed $items array of menu items, else false.
  */
 function wp_get_nav_menu_items( $menu, $args = array() ) {
-       global $_wp_using_ext_object_cache;
-
        $menu = wp_get_nav_menu_object( $menu );
 
        if ( ! $menu )
@@ -504,7 +502,7 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
                return false;
 
        // Get all posts and terms at once to prime the caches
-       if ( empty( $fetched[$menu->term_id] ) || $_wp_using_ext_object_cache ) {
+       if ( empty( $fetched[$menu->term_id] ) || wp_using_ext_object_cache() ) {
                $fetched[$menu->term_id] = true;
                $posts = array();
                $terms = array();
@@ -685,9 +683,10 @@ function wp_setup_nav_menu_item( $menu_item ) {
  *
  * @param int $object_id The ID of the original object.
  * @param string $object_type The type of object, such as "taxonomy" or "post_type."
+ * @param string $taxonomy If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to
  * @return array The array of menu item IDs; empty array if none;
  */
-function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type' ) {
+function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
        $object_id = (int) $object_id;
        $menu_item_ids = array();
 
@@ -703,7 +702,8 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
        );
        foreach( (array) $menu_items as $menu_item ) {
                if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
-                       if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) != $object_type )
+                       if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type ||
+                               get_post_meta( $menu_item->ID, '_menu_item_object', true ) !== $taxonomy )
                                continue;
 
                        $menu_item_ids[] = (int) $menu_item->ID;
@@ -741,10 +741,10 @@ function _wp_delete_post_menu_item( $object_id = 0 ) {
  * @param int $object_id The ID of the original object being trashed.
  *
  */
-function _wp_delete_tax_menu_item( $object_id = 0 ) {
+function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) {
        $object_id = (int) $object_id;
 
-       $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy' );
+       $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
 
        foreach( (array) $menu_item_ids as $menu_item_id ) {
                wp_delete_post( $menu_item_id, true );