diff --git a/wp-includes/taxonomy-functions.php b/wp-includes/taxonomy-functions.php index 6ed4cb3e24..53435c0bc6 100644 --- a/wp-includes/taxonomy-functions.php +++ b/wp-includes/taxonomy-functions.php @@ -991,7 +991,8 @@ function get_term_to_edit( $id, $taxonomy ) { * @since 2.3.0 * @since 4.2.0 Introduced 'name' and 'childless' parameters. * @since 4.4.0 Introduced the ability to pass 'term_id' as an alias of 'id' for the `orderby` parameter. - * Introduced the 'meta_query' and 'update_term_meta_cache' parameters. + * Introduced the 'meta_query' and 'update_term_meta_cache' parameters. Converted to return + * a list of WP_Term objects. * * @global wpdb $wpdb WordPress database abstraction object. * @global array $wp_filter @@ -1052,8 +1053,8 @@ function get_term_to_edit( $id, $taxonomy ) { * @type array $meta_query Meta query clauses to limit retrieved terms by. * See `WP_Meta_Query`. Default empty. * } - * @return array|int|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies - * do not exist. + * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies + * do not exist. */ function get_terms( $taxonomies, $args = '' ) { global $wpdb; @@ -1493,6 +1494,8 @@ function get_terms( $taxonomies, $args = '' ) { foreach ( $terms as $term ) { $_terms[ $term->term_id ] = $term->slug; } + } else { + $_terms = array_map( 'get_term', $terms ); } if ( ! empty( $_terms ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index d0911da0d1..a983951311 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34997'; +$wp_version = '4.4-alpha-34998'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.