WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/custom_nav()/wp_nav_menu()/. see #11817 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-24 06:18:13 +00:00
parent 911a6b1c09
commit 82d81675f9
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/custom-navigation.php
View File

@ -49,6 +49,10 @@ function wp_create_nav_menu( $menu_name ) {
return wp_insert_term( $menu_name, 'nav_menu' ); 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() { function wp_get_nav_menus() {
return get_terms( 'nav_menu', array( 'hide_empty' => false ) ); return get_terms( 'nav_menu', array( 'hide_empty' => false ) );
} }

2
wp-includes/default-widgets.php
View File

@ -1126,7 +1126,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
<?php <?php
//DISPLAY custom navigation menu //DISPLAY custom navigation menu
if ( get_option('wp_custom_nav_menu') == 'true' ) 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 <?php

6
wp-includes/general-template.php
View File

@ -2216,11 +2216,13 @@ function get_the_generator( $type = '' ) {
} }
/** /**
* Outputs the Custom Navigation. * Outputs a navigation menu.
* *
* @since 3.0.0 * @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'); require_once (ABSPATH . WPINC . '/custom-navigation.php');
wp_custom_navigation_output($args); wp_custom_navigation_output($args);
} }