Ticket #16717: 16717.2.diff

wp-includes/query.php

@@ -2185 +2185 @@
                                 if ( !empty( $cat_query ) ) {
                                         $cat_query = reset( $cat_query );
                                         $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
-                                        if ( $the_cat ) {
+                                        if ( $the_cat && ! is_wp_error( $the_cat ) ) {
                                                 $this->set( 'cat', $the_cat->term_id );
                                                 $this->set( 'category_name', $the_cat->slug );
                                         }
@@ -2197 +2197 @@
                                 if ( !empty( $tag_query ) ) {
                                         $tag_query = reset( $tag_query );
                                         $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
-                                        if ( $the_tag ) {
+                                        if ( $the_tag && ! is_wp_error( $the_tag ) ) {
                                                 $this->set( 'tag_id', $the_tag->term_id );
                                         }
                                         unset( $the_tag );