From 95f5cecd77ebb2b0de88ff013f174548519b0ef6 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 21 Jan 2020 20:13:05 +0000 Subject: [PATCH] Docs: Expand `@return` value description for `wp_nav_menu()`. See #48303. Built from https://develop.svn.wordpress.org/trunk@47097 git-svn-id: http://core.svn.wordpress.org/trunk@46897 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 649f4cfd76..e3415de52a 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -43,7 +43,8 @@ require_once ABSPATH . WPINC . '/class-walker-nav-menu.php'; * Uses printf() format with numbered placeholders. * @type string $item_spacing Whether to preserve whitespace within the menu's HTML. Accepts 'preserve' or 'discard'. Default 'preserve'. * } - * @return string|false|void Menu output if $echo is false, false if there are no items or no menu was found. + * @return void|string|false Void if 'echo' argument is true, menu output if 'echo' is false. + * False if there are no items or no menu was found. */ function wp_nav_menu( $args = array() ) { static $menu_id_slugs = array(); diff --git a/wp-includes/version.php b/wp-includes/version.php index d94ea2cd5f..f5611ad21c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-47096'; +$wp_version = '5.4-alpha-47097'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.