WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for WP_Error return from get_term_by(). Props fabifott, kawauso, nacin. fixes #16717 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-03-08 22:06:35 +00:00
parent 73799784cc
commit 183cd06cf3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/query.php
View File

@ -2190,7 +2190,7 @@ class WP_Query {
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 );
}
@ -2202,7 +2202,7 @@ class WP_Query {
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 );