Pass the proper values to `get_terms` action.
* `$term_query` should be passed. * Second and third params should come from the `$term_query->query_vars` array, so that they're fully parsed. These changes were missed in [37572]. Props flixos90, sebastian.pisula. See #35381. Fixes #36951. Built from https://develop.svn.wordpress.org/trunk@37576 git-svn-id: http://core.svn.wordpress.org/trunk@37544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
607335ad6b
commit
d904eeb08a
|
@ -1206,8 +1206,6 @@ function get_terms( $args = array(), $deprecated = '' ) {
|
|||
|
||||
$terms = $term_query->query( $args );
|
||||
|
||||
$taxonomies = isset( $args['taxonomy'] ) ? (array) $args['taxonomy'] : null;
|
||||
|
||||
/**
|
||||
* Filters the found terms.
|
||||
*
|
||||
|
@ -1219,7 +1217,7 @@ function get_terms( $args = array(), $deprecated = '' ) {
|
|||
* @param array $args An array of get_terms() arguments.
|
||||
* @param WP_Term_Query $term_query The WP_Term_Query object.
|
||||
*/
|
||||
return apply_filters( 'get_terms', $terms, $taxonomies, $args );
|
||||
return apply_filters( 'get_terms', $terms, $term_query->query_vars['taxonomy'], $term_query->query_vars, $term_query );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.6-alpha-37575';
|
||||
$wp_version = '4.6-alpha-37576';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue