Prevent notices on non-existent Term locations (such as /tag/404-non-existant-term/)
git-svn-id: http://svn.automattic.com/wordpress/trunk@15827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f76743d01a
commit
ddae2a0b15
|
@ -2577,13 +2577,16 @@ class WP_Query extends WP_Object_Query {
|
||||||
|
|
||||||
if ( !empty( $tax_query ) ) {
|
if ( !empty( $tax_query ) ) {
|
||||||
$query = reset( $tax_query );
|
$query = reset( $tax_query );
|
||||||
|
|
||||||
if ( 'term_id' == $query['field'] )
|
if ( 'term_id' == $query['field'] )
|
||||||
$term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
|
$term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
|
||||||
else
|
else
|
||||||
$term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
|
$term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
|
||||||
|
|
||||||
|
if ( $term && ! is_wp_error($term) ) {
|
||||||
$this->queried_object = $term;
|
$this->queried_object = $term;
|
||||||
$this->queried_object_id = $term->term_id;
|
$this->queried_object_id = $term->term_id;
|
||||||
|
}
|
||||||
} elseif ( $this->is_posts_page ) {
|
} elseif ( $this->is_posts_page ) {
|
||||||
$page_for_posts = get_option('page_for_posts');
|
$page_for_posts = get_option('page_for_posts');
|
||||||
$this->queried_object = & get_page( $page_for_posts );
|
$this->queried_object = & get_page( $page_for_posts );
|
||||||
|
|
Loading…
Reference in New Issue