Changeset 31366 for trunk/src/wp-includes/query.php

Timestamp:

02/07/2015 07:49:17 PM (10 years ago)

Author:

boonebgorges

Message:

In WP_Query::get_queried_object(), avoid PHP notices when is_tax is paired with an empty tax_query.

It's possible to have an empty tax_query and is_tax=true when the initial
query contains a taxonomy var (and is processed as such during
WP_Query::parse_query()) but the taxonomy var is unset during a 'parse_query'
callback. While this kind of behavior is not necessarily something we need to
support, we should continue to avoid PHP notices in such cases, as we did prior
to WP 4.1.

Fixes #31246.

File:

• trunk/src/wp-includes/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -3901 +3901 @@
                 $tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' );
 
-                $queried_taxonomies = array_keys( $tax_query_in_and );
-                $matched_taxonomy = reset( $queried_taxonomies );
-                $query = $tax_query_in_and[ $matched_taxonomy ];
-
-                if ( $query['terms'] ) {
-                    if ( 'term_id' == $query['field'] ) {
-                        $term = get_term( reset( $query['terms'] ), $matched_taxonomy );
-                    } else {
-                        $term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+                if ( ! empty( $tax_query_in_and ) ) {
+                    $queried_taxonomies = array_keys( $tax_query_in_and );
+                    $matched_taxonomy = reset( $queried_taxonomies );
+                    $query = $tax_query_in_and[ $matched_taxonomy ];
+
+                    if ( $query['terms'] ) {
+                        if ( 'term_id' == $query['field'] ) {
+                            $term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+                        } else {
+                            $term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+                        }
                     }
                 }