From 132f3d0d19743a28dc97ee8ec868f07aa534cbdc Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Fri, 9 Sep 2016 19:49:29 +0000 Subject: [PATCH] Query: Eliminate unnecessary `wp_list_filter()` call in `get_queried_object()`. The refactor in [30711] swapped out the old `queries` property for the new `queried_terms`, but should also have gotten rid of the now- superfluous `wp_list_filter()` call. Fixes #37962. Built from https://develop.svn.wordpress.org/trunk@38586 git-svn-id: http://core.svn.wordpress.org/trunk@38529 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-query.php | 8 +++----- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index fd7dfe08db..5a90618fae 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -3257,12 +3257,10 @@ class WP_Query { } } else { // For other tax queries, grab the first term from the first clause. - $tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' ); - - if ( ! empty( $tax_query_in_and ) ) { - $queried_taxonomies = array_keys( $tax_query_in_and ); + if ( ! empty( $this->tax_query->queried_terms ) ) { + $queried_taxonomies = array_keys( $this->tax_query->queried_terms ); $matched_taxonomy = reset( $queried_taxonomies ); - $query = $tax_query_in_and[ $matched_taxonomy ]; + $query = $this->tax_query->queried_terms[ $matched_taxonomy ]; if ( ! empty( $query['terms'] ) ) { if ( 'term_id' == $query['field'] ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 416806f577..52180187cc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38585'; +$wp_version = '4.7-alpha-38586'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.