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

Docs: Document the parameters of `wp_get_associated_nav_menu_items()` as optional. 

See #50768.
Built from https://develop.svn.wordpress.org/trunk@48793


git-svn-id: http://core.svn.wordpress.org/trunk@48555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-08-15 13:12:06 +00:00
parent 440eb31bb7
commit 756de63216
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -988,11 +988,12 @@ function wp_setup_nav_menu_item( $menu_item ) {
* *
* @since 3.0.0 * @since 3.0.0
* *
* @param int $object_id The ID of the original object. * @param int $object_id Optional. The ID of the original object. Default 0.
* @param string $object_type The type of object, such as 'taxonomy' or 'post_type'. * @param string $object_type Optional. The type of object, such as 'post_type' or 'taxonomy'.
* @param string $taxonomy If $object_type is 'taxonomy', $taxonomy is the name of the tax * Default 'post_type'.
* that $object_id belongs to. * @param string $taxonomy Optional. If $object_type is 'taxonomy', $taxonomy is the name
* @return int[] The array of menu item IDs; empty array if none; * of the tax that $object_id belongs to. Default empty.
* @return int[] The array of menu item IDs; empty array if none.
*/ */
function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) { function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
$object_id = (int) $object_id; $object_id = (int) $object_id;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-48792'; $wp_version = '5.6-alpha-48793';
/** /**
* 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.