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

Menus: In `wp_nav_menu_item_taxonomy_meta_box()`: 

* Rename the `$taxonomy` parameter to `$box` for clarity and consistency with other meta box functions.
* Make the docs more consistent with `post_categories_meta_box()` and other meta box functions.

See #37211.
Built from https://develop.svn.wordpress.org/trunk@38130


git-svn-id: http://core.svn.wordpress.org/trunk@38071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-07-21 19:21:28 +00:00
parent 5fd308db50
commit 97fd7d829f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/nav-menu.php
View File

@ -584,18 +584,18 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
* @global int|string $nav_menu_selected_id * @global int|string $nav_menu_selected_id
* *
* @param string $object Not used. * @param string $object Not used.
* @param array $taxonomy { * @param array $box {
* Data that will be used as arguments of the taxonomy meta box. * Data that will be used as arguments of the taxonomy meta box.
* *
* @type string $id Meta box ID (used in the 'id' attribute for the meta box). * @type string $id Meta box ID (used in the 'id' attribute for the meta box).
* @type string $title Title of the meta box. * @type string $title Meta box title.
* @type string $callback Function that fills the box with the desired content. * @type string $callback Meta box display callback.
* @type object $args The current taxonomy object for this menu item meta box. * @type object $args Extra meta box arguments (the taxonomy object for this meta box).
* } * }
*/ */
function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
global $nav_menu_selected_id; global $nav_menu_selected_id;
$taxonomy_name = $taxonomy['args']->name; $taxonomy_name = $box['args']->name;
// Paginate browsing for large numbers of objects. // Paginate browsing for large numbers of objects.
$per_page = 50; $per_page = 50;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta4-38129'; $wp_version = '4.6-beta4-38130';
/** /**
* 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.