Permalink
Browse files

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
  • Loading branch information...
1 parent 163d59f commit 132f3d0d19743a28dc97ee8ec868f07aa534cbdc @boonebgorges boonebgorges committed Sep 9, 2016
Showing with 4 additions and 6 deletions.
  1. +3 −5 wp-includes/class-wp-query.php
  2. +1 −1 wp-includes/version.php
@@ -3257,12 +3257,10 @@ public function get_queried_object() {
}
} 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'] ) {
@@ -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.

0 comments on commit 132f3d0

Please sign in to comment.