Changeset 27521

Timestamp:

03/13/2014 04:03:06 AM (11 years ago)

Author:

wonderboymusic

Message:

Avoid a notice in get_the_category_by_ID() when is_wp_error( $term ) is false but $term->name is not set. Clarify the @return value of get_category() and get_tag() which return the same possible types as get_term(), which they wrap.

Props ericmann, SergeyBiryukov.
Fixes #25429.

Location:

trunk/src/wp-includes

Files:

• category-template.php (modified) (1 diff)
• category.php (modified) (2 diffs)

trunk/src/wp-includes/category-template.php

@@ -137 +137 @@
     $cat_ID = (int) $cat_ID;
     $category = get_term( $cat_ID, 'category' );
+
     if ( is_wp_error( $category ) )
         return $category;
-    return $category->name;
+
+    return ( $category ) ? $category->name : '';
 }
 

trunk/src/wp-includes/category.php

@@ -86 +86 @@
  * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
  * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
- * @return mixed Category data in type defined by $output parameter.
+ * @return object|array|WP_Error|null Category data in type defined by $output parameter. WP_Error if $category is empty, null if it does not exist.
  */
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
     $category = get_term( $category, 'category', $output, $filter );
+
     if ( is_wp_error( $category ) )
         return $category;
@@ -302 +303 @@
  * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
  * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
- * @return object|array Return type based on $output value.
+ * @return object|array|WP_Error|null Tag data in type defined by $output parameter. WP_Error if $tag is empty, null if it does not exist.
  */
 function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {