Ticket #14439: nav_menu.patch

wp-includes/nav-menu.php

@@ -642 +642 @@
  * @param string $object_type The type of object, such as "taxonomy" or "post_type."
  * @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', $menu_id=0 ) {
         $object_id = (int) $object_id;
         $menu_item_ids = array();
 
+    $query_args = array(
+                                'meta_key' => '_menu_item_object_id',
+                                'meta_value' => $object_id,
+                                'post_status' => 'any',
+                                'post_type' => 'nav_menu_item',
+                                'showposts' => -1,
+                          );
+
+    if( $menu_id ) {
+            $term = get_term($menu_id, 'nav_menu');
+                $query_args = array_merge($query_args, array( 'taxonomy' => 'nav_menu', 'term' => $term->slug) );
+        }
+
         $query = new WP_Query;
-        $menu_items = $query->query(
-                array(
-                        'meta_key' => '_menu_item_object_id',
-                        'meta_value' => $object_id,
-                        'post_status' => 'any',
-                        'post_type' => 'nav_menu_item',
-                        'showposts' => -1,
-                )
-        );
+        $menu_items = $query->query( $query_args);
+
         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 )