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

Fix is_nav_menu(). Props Utkarsh. see #11817 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-03-02 17:56:24 +00:00
parent 302fd434c9
commit b37894c348
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/nav-menu.php
View File

@ -30,17 +30,22 @@ function wp_get_nav_menu_object( $menu ) {
* @return mixed Menu Object, if exists. * @return mixed Menu Object, if exists.
*/ */
function is_nav_menu( $menu ) { function is_nav_menu( $menu ) {
if ( $menu ) { if ( !$menu )
$menu = get_term( $menu, 'nav_menu' ); return false;
} elseif ( !$menu ) {
$menu = get_term_by( 'slug', $menu, 'nav_menu' ); $menu_obj = get_term( $menu, 'nav_menu' );
} elseif( !$menu ) {
$menu = get_term_by( 'name', $menu, 'nav_menu' ); if ( !$menu_obj )
} else { $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' );
$menu = false;
if ( !$menu_obj )
$menu_obj = get_term_by( 'name', $menu, 'nav_menu' );
if ( !$menu_obj ) {
$menu_obj = false;
} }
return $menu; return $menu_obj;
} }
/** /**