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

Make it explicit that you can set fallback_cb to false in wp_nav_menu. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-10-11 03:16:45 +00:00
parent f0d8d094e2
commit 57ccc147e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/nav-menu-template.php
View File

@ -119,7 +119,7 @@ class Walker_Nav_Menu extends Walker {
* container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'. * container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'.
* container_class - the class that is applied to the container. Defaults to 'menu-{menu slug}-container'. * container_class - the class that is applied to the container. Defaults to 'menu-{menu slug}-container'.
* container_id - The ID that is applied to the container. Defaults to blank. * container_id - The ID that is applied to the container. Defaults to blank.
* fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'. * fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'. Set to false for no fallback.
* before - Text before the link text. * before - Text before the link text.
* after - Text after the link text. * after - Text after the link text.
* link_before - Text before the link. * link_before - Text before the link.
@ -168,7 +168,7 @@ function wp_nav_menu( $args = array() ) {
// If no menu was found or if the menu has no items and no location was requested, call the fallback_cb if it exists // If no menu was found or if the menu has no items and no location was requested, call the fallback_cb if it exists
if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) ) if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
&& ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) ) && $args->fallback_cb && ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) )
return call_user_func( $args->fallback_cb, (array) $args ); return call_user_func( $args->fallback_cb, (array) $args );
// If no fallback function was specified and the menu doesn't exists, bail. // If no fallback function was specified and the menu doesn't exists, bail.