Changeset 22450

Timestamp:

11/07/12 22:09:05 (18 months ago)

Author:

nacin

Message:

Don't call get_term_by() in get_queried_object() if we have no terms. props wonderboymusic. fixes #21967.

File:

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

trunk/wp-includes/query.php

@@ -2996 +2996 @@
             if ( 'term_id' == $query['field'] )
                 $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-            else
+            elseif ( $query['terms'] )
                 $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
 
-            if ( $term && ! is_wp_error($term) )  {
+            if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
                 $this->queried_object = $term;
                 $this->queried_object_id = (int) $term->term_id;