Changeset 15772

Timestamp:

10/11/2010 03:16:45 AM (14 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-includes/nav-menu-template.php (modified) (2 diffs)

trunk/wp-includes/nav-menu-template.php

@@ -120 +120 @@
  * 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.
- * 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.
  * after - Text after the link text.
@@ -169 +169 @@
     // 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 ) )
-        && ( 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 );