From eb7df1379be5f7b24a6d29c1a390c1b1bf2e6183 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 20 Jun 2016 08:26:29 +0000 Subject: [PATCH] Docs: Improve the summaries and return descriptions for `get_registered_nav_menus()` and `get_nav_menu_locations()`. Props rabmalin for the initial patch. Fixes #37106. Built from https://develop.svn.wordpress.org/trunk@37752 git-svn-id: http://core.svn.wordpress.org/trunk@37717 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu.php | 10 ++++++---- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index 2a9f229222..ae573c5c3e 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -126,13 +126,13 @@ function register_nav_menu( $location, $description ) { register_nav_menus( array( $location => $description ) ); } /** - * Returns all registered navigation menu locations in a theme. + * Retrieves all registered navigation menu locations in a theme. * * @since 3.0.0 * * @global array $_wp_registered_nav_menus * - * @return array + * @return array Registered navigation menu locations. If none are registered, an empty array. */ function get_registered_nav_menus() { global $_wp_registered_nav_menus; @@ -142,10 +142,12 @@ function get_registered_nav_menus() { } /** - * Returns an array with the registered navigation menu locations and the menu assigned to it + * Retrieves all registered navigation menu locations and the menus assigned to them. * * @since 3.0.0 - * @return array + * + * @return array Registered navigation menu locations and the menus assigned them. + * If none are registered, an empty array. */ function get_nav_menu_locations() { diff --git a/wp-includes/version.php b/wp-includes/version.php index 1e1d567aab..0b3b5c0869 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37751'; +$wp_version = '4.6-alpha-37752'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.