Changeset 26874

Timestamp:

12/27/2013 07:29:39 PM (13 years ago)

Author:

wonderboymusic

Message:

In WP_Query::get_queried_object(), move the check for $query['terms'] to a place where $query is actually set. This should be included if [26864] makes it into 3.8.1.

Props SergeyBiryukov.
See #26728, [26864], #26634, #26627.

File:

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

trunk/src/wp-includes/query.php

@@ -3272 +3272 @@
                         } elseif ( $this->is_tag ) {
                                 $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-                        } elseif ( $query['terms'] ) {
+                        } else {
                                 $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
                                 $query = reset( $tax_query_in_and );
 
-                                if ( 'term_id' == $query['field'] )
-                                        $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-                                else
-                                        $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+                                if ( $query['terms'] ) {
+                                        if ( 'term_id' == $query['field'] ) {
+                                                $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
+                                        } else {
+                                                $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+                                        }
+                                }
                         }