Changeset 17527

Timestamp:

03/22/2011 08:07:50 PM (15 years ago)

Author:

ryan

Message:

Return false instead of WP_Error from get_term_by() if the term does not exist. Makes fetching a term by id consistent with slug and name. Props hakre. fixes #16464 #16717 for 3.1

Location:

branches/3.1/wp-includes

Files:

• query.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)

branches/3.1/wp-includes/query.php

@@ -2191 +2191 @@
                     $cat_query = reset( $cat_query );
                     $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
-                    if ( $the_cat && ! is_wp_error( $the_cat ) ) {
+                    if ( $the_cat ) {
                         $this->set( 'cat', $the_cat->term_id );
                         $this->set( 'category_name', $the_cat->slug );
@@ -2203 +2203 @@
                     $tag_query = reset( $tag_query );
                     $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
-                    if ( $the_tag && ! is_wp_error( $the_tag ) ) {
+                    if ( $the_tag ) {
                         $this->set( 'tag_id', $the_tag->term_id );
                     }

branches/3.1/wp-includes/taxonomy.php

@@ -890 +890 @@
         $field = 't.name';
     } else {
-        return get_term( (int) $value, $taxonomy, $output, $filter);
+        $term = get_term( (int) $value, $taxonomy, $output, $filter);
+        if ( is_wp_error( $term ) )
+            $term = false;
+        return $term;
     }