From 82d81675f99ba6e86a3045cb1f11f8567f8d2b3a Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 24 Feb 2010 06:18:13 +0000
Subject: [PATCH] s/custom_nav()/wp_nav_menu()/. see #11817

git-svn-id: http://svn.automattic.com/wordpress/trunk@13361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/custom-navigation.php | 4 ++++
 wp-includes/default-widgets.php   | 2 +-
 wp-includes/general-template.php  | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/wp-includes/custom-navigation.php b/wp-includes/custom-navigation.php
index e989816eec..188c5b7473 100644
--- a/wp-includes/custom-navigation.php
+++ b/wp-includes/custom-navigation.php
@@ -49,6 +49,10 @@ function wp_create_nav_menu( $menu_name ) {
 	return wp_insert_term( $menu_name, 'nav_menu' );
 }
 
+function wp_get_nav_menu( $menu ) {
+	return get_term( (int) $menu, 'nav_menu');
+}
+
 function wp_get_nav_menus() {
 	return get_terms( 'nav_menu', array( 'hide_empty' => false ) );
 }
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 5dfddf4d88..a940ad7a01 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -1126,7 +1126,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 						<?php
 							//DISPLAY custom navigation menu
 							if ( get_option('wp_custom_nav_menu') == 'true' )
-        						custom_nav( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription) );
+        						wp_nav_menu( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription) );
 						?>
 
 				<?php
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 6a548a6c31..84045b3b3b 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2216,11 +2216,13 @@ function get_the_generator( $type = '' ) {
 }
 
 /**
- * Outputs the Custom Navigation.
+ * Outputs a navigation menu.
  *
  * @since 3.0.0
+ *
+ * @param array $args Arguments
  */
-function custom_nav($args = array()) {
+function wp_nav_menu( $args = array() ) {
 	require_once (ABSPATH . WPINC . '/custom-navigation.php');
 	wp_custom_navigation_output($args);
 }