Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 15:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Ensure the optional parameter in get_object_taxonomies() is documented as such.

Browse Source 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-05-07 20:37:17 +00:00
parent b801f6f230
commit 3050d96310
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/taxonomy.php
View File

@ -171,10 +171,11 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
* @global array $wp_taxonomies The registered taxonomies.
*
* @param array|string|object $object Name of the type of taxonomy object, or an object (row from posts)
* @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
* @param string $output Optional. The type of output to return in the array. Accepts either
* taxonomy 'names' or 'objects'. Default 'names'.
* @return array The names of all taxonomy of $object_type.
*/
function get_object_taxonomies($object, $output = 'names') {
function get_object_taxonomies( $object, $output = 'names' ) {
global $wp_taxonomies;
if ( is_object($object) ) {

2
wp-includes/version.php
View File

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