Changeset 13532
- Timestamp:
- 03/01/2010 12:53:51 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/nav-menu-template.php
r13512 r13532 30 30 $args = apply_filters( 'wp_nav_menu_args', $args ); 31 31 $args = (object) $args; 32 32 33 33 // Get the nav menu 34 34 $menu = wp_get_nav_menu_object( $args->menu ); … … 45 45 } 46 46 } 47 48 $args->menu = $menu->term_id; 47 48 if ( $menu ) 49 $args->menu = $menu->term_id; 49 50 $nav_menu = ''; 50 51 if ( 'div' == $args->format ) 52 $nav_menu .= '<div id="menu-'. $menu->slug .'" class="' . esc_attr($args->menu_class) . '">'; 53 51 52 if ( 'div' == $args->format ) { 53 if ( $menu ) 54 $nav_menu .= '<div id="menu-' . $menu->slug . '" class="' . esc_attr($args->menu_class) . '">'; 55 else 56 $nav_menu .= '<div id="menu-default">'; 57 } 58 54 59 $nav_menu .= wp_get_nav_menu( $args ); 55 60 56 61 if ( 'div' == $args->format ) 57 62 $nav_menu .= '</div>'; 58 63 59 64 $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu ); 60 61 return $args->echo ? print $nav_menu : $nav_menu; 65 66 if ( $args->echo ) 67 echo $nav_menu; 68 else 69 return $nav_menu; 62 70 } 63 71 … … 84 92 // If no menu was found, call the fallback_cb 85 93 if ( !$menu || is_wp_error($menu) ) { 86 if ( function_exists($args->fallback_cb) ) 87 return call_user_func( $args->fallback_cb, $args ); 94 if ( function_exists($args->fallback_cb) ) { 95 $_args = array_merge( (array)$args, array('echo' => false) ); 96 return call_user_func( $args->fallback_cb, $_args ); 97 } 88 98 } 89 99
Note: See TracChangeset
for help on using the changeset viewer.