Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-10-17 06:14:58 +00:00
parent f76743d01a
commit ddae2a0b15
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/query.php
View File

@ -2577,13 +2577,16 @@ class WP_Query extends WP_Object_Query {
if ( !empty( $tax_query ) ) {
$query = reset( $tax_query );
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'] );
$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');
$this->queried_object = & get_page( $page_for_posts );