sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return null if queried object not found. fixes #8244

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@9859 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-11-24 06:14:40 +00:00
parent 9ce938ea51
commit e8169296b0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/query.php
View File

@ -2524,13 +2524,15 @@ class WP_Query {
if ($this->is_category) { if ($this->is_category) {
$cat = $this->get('cat'); $cat = $this->get('cat');
$category = &get_category($cat); $category = &get_category($cat);
if ( is_wp_error( $category ) )
return NULL;
$this->queried_object = &$category; $this->queried_object = &$category;
$this->queried_object_id = (int) $cat; $this->queried_object_id = (int) $cat;
} else if ($this->is_tag) { } else if ($this->is_tag) {
$tag_id = $this->get('tag_id'); $tag_id = $this->get('tag_id');
$tag = &get_term($tag_id, 'post_tag'); $tag = &get_term($tag_id, 'post_tag');
if ( is_wp_error( $tag ) ) if ( is_wp_error( $tag ) )
return $tag; return NULL;
$this->queried_object = &$tag; $this->queried_object = &$tag;
$this->queried_object_id = (int) $tag_id; $this->queried_object_id = (int) $tag_id;
} else if ($this->is_tax) { } else if ($this->is_tax) {
@ -2538,7 +2540,7 @@ class WP_Query {
$slug = $this->get('term'); $slug = $this->get('term');
$term = &get_terms($tax, array('slug'=>$slug)); $term = &get_terms($tax, array('slug'=>$slug));
if ( is_wp_error($term) || empty($term) ) if ( is_wp_error($term) || empty($term) )
return $term; return NULL;
$term = $term[0]; $term = $term[0];
$this->queried_object = $term; $this->queried_object = $term;
$this->queried_object_id = $term->term_id; $this->queried_object_id = $term->term_id;