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

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
This commit is contained in:
Drew Jaynes 2016-06-20 08:26:29 +00:00
parent 07cef1ce62
commit eb7df1379b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {

2
wp-includes/version.php
View File

@ -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.