Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-16 07:35:39 +01:00
Code Issues Projects Releases Wiki Activity

Docs: Correct DocBlock descriptions for the $before, $after, $link_before, and $link_after arguments for wp_nav_menu().

Browse Source 
* `$before` falls before the link markup starts
* `$after` falls after the link markup ends
* `$link_before` falls before the link text
* `$link_after` falls after the link text

Props wp_smith for the initial patch.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-05-25 16:17:27 +00:00
parent bef05b469b
commit 318f745808
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-template.php
View File

@ -235,10 +235,10 @@ class Walker_Nav_Menu extends Walker {
* @type string $container_id The ID that is applied to the container. Default empty. * @type string $container_id The ID that is applied to the container. Default empty.
* @type callable|bool $fallback_cb If the menu doesn't exists, a callback function will fire. * @type callable|bool $fallback_cb If the menu doesn't exists, a callback function will fire.
* Default is 'wp_page_menu'. Set to false for no fallback. * Default is 'wp_page_menu'. Set to false for no fallback.
* @type string $before Text before the link text. Default empty. * @type string $before Text before the link markup. Default empty.
* @type string $after Text after the link text. Default empty. * @type string $after Text after the link markup. Default empty.
* @type string $link_before Text before the link. Default empty. * @type string $link_before Text before the link text. Default empty.
* @type string $link_after Text after the link. Default empty. * @type string $link_after Text after the link text. Default empty.
* @type bool $echo Whether to echo the menu or return it. Default true. * @type bool $echo Whether to echo the menu or return it. Default true.
* @type int $depth How many levels of the hierarchy are to be included. 0 means all. Default 0. * @type int $depth How many levels of the hierarchy are to be included. 0 means all. Default 0.
* @type object $walker Instance of a custom walker class. Default empty. * @type object $walker Instance of a custom walker class. Default empty.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37560'; $wp_version = '4.6-alpha-37561';
/** /**
* 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.