From a245838c42da68ade526d75bb191c4502896025e Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Sat, 17 Jan 2015 20:39:23 +0000 Subject: [PATCH] Correct `wp_get_object_terms()` documentation. The 'orderby' parameter accepts a number of values that have never been properly documented. Built from https://develop.svn.wordpress.org/trunk@31232 git-svn-id: http://core.svn.wordpress.org/trunk@31213 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 5 +++-- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 9fbad6b3cd..ba70344253 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -2552,7 +2552,7 @@ function wp_delete_category( $cat_ID ) { /** * Retrieves the terms associated with the given object(s), in the supplied taxonomies. - + * * @since 2.3.0 * * @global wpdb $wpdb WordPress database abstraction object. @@ -2561,7 +2561,8 @@ function wp_delete_category( $cat_ID ) { * @param string|array $taxonomies The taxonomies to retrieve terms from. * @param array|string $args { * Array of arguments. - * @type string $orderby Field by which results should be sorted. Accepts 'name' or 'count'. Default 'name'. + * @type string $orderby Field by which results should be sorted. Accepts 'name', 'count', 'slug', 'term_group', + * or 'term_order'. Default 'name'. * @type string $order Sort order. Accepts 'ASC' or 'DESC'. Default 'ASC'. * @type string $fields Fields to return for matched terms. Accepts 'all', 'ids', 'names', and * 'all_with_object_id'. Note that 'all' or 'all_with_object_id' will result in an array of diff --git a/wp-includes/version.php b/wp-includes/version.php index a34387e5f2..766a6dc047 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31231'; +$wp_version = '4.2-alpha-31232'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.