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

Docs: Nav menu location functions relate to nav menu locations, not nav menus. 

Fixes #35471.

Built from https://develop.svn.wordpress.org/trunk@36330


git-svn-id: http://core.svn.wordpress.org/trunk@36297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Eric Lewis 2016-01-17 01:43:26 +00:00
parent 4e978a1ce6
commit fd99c1705e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ function is_nav_menu( $menu ) {
} }
/** /**
* Register navigation menus for a theme. * Register navigation menu locations for a theme.
* *
* @since 3.0.0 * @since 3.0.0
* *
@ -94,7 +94,7 @@ function register_nav_menus( $locations = array() ) {
} }
/** /**
* Unregisters a navigation menu for a theme. * Unregisters a navigation menu location for a theme.
* *
* @global array $_wp_registered_nav_menus * @global array $_wp_registered_nav_menus
* *
@ -115,7 +115,7 @@ function unregister_nav_menu( $location ) {
} }
/** /**
* Register a navigation menu for a theme. * Register a navigation menu location for a theme.
* *
* @since 3.0.0 * @since 3.0.0
* *
@ -126,7 +126,7 @@ function register_nav_menu( $location, $description ) {
register_nav_menus( array( $location => $description ) ); register_nav_menus( array( $location => $description ) );
} }
/** /**
* Returns an array of all registered navigation menus in a theme * Returns all registered navigation menu locations in a theme.
* *
* @since 3.0.0 * @since 3.0.0
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-1452939254282'; $wp_version = '4.5-alpha-1452994992579';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.