No need to setup the nav menu items again. wp_get_nav_menu_items() handles it. see #12734

git-svn-id: http://svn.automattic.com/wordpress/trunk@14558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-11 14:25:10 +00:00 · 2010-05-11 14:25:10 +00:00 · a491596163
parent 69d0ec946e
commit a491596163
1 changed files with 1 additions and 1 deletions
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@ -240,7 +240,7 @@ function wp_nav_menu( $args = array() ) {
 	// Set up the $menu_item variables
 	$sorted_menu_items = array();
 	foreach ( (array) $menu_items as $key => $menu_item )
-		$sorted_menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item );
+		$sorted_menu_items[$menu_item->menu_order] = $menu_item;

 	$items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );