Changeset 15827

Timestamp:

10/17/2010 06:14:58 AM (16 years ago)

Author:

dd32

Message:

Prevent notices on non-existent Term locations (such as /tag/404-non-existant-term/)

File:

• trunk/wp-includes/query.php (modified) (2 diffs)

trunk/wp-includes/query.php

@@ -2578 +2578 @@
                 if ( !empty( $tax_query ) ) {
                         $query = reset( $tax_query );
+
                         if ( 'term_id' == $query['field'] )
                                 $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
@@ -2583 +2584 @@
                                 $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
 
-                        $this->queried_object = $term;
-                        $this->queried_object_id = $term->term_id;
+                        if ( $term && ! is_wp_error($term) )  {
+                                $this->queried_object = $term;
+                                $this->queried_object_id = $term->term_id;
+                        }
                 } elseif ( $this->is_posts_page ) {
                         $page_for_posts = get_option('page_for_posts');