Changeset 17438

Timestamp:

02/10/2011 08:19:02 PM (14 years ago)

Author:

ryan

Message:

Return empty strings instead of WP_Errro from get_category_link(), get_term_link(), and get_tag_link() when passed an invalid term. Clarify phpdoc. Props nacin. fixes #16521 for 3.1

Location:

branches/3.1/wp-includes

Files:

• category-template.php (modified) (2 diffs)
• taxonomy.php (modified) (2 diffs)

branches/3.1/wp-includes/category-template.php

@@ -13 +13 @@
  * @see get_term_link()
  *
- * @param int $category_id Category ID.
- * @return string|WP_Error Link on success, WP_Error if category does not exist.
- */
-function get_category_link( $category_id ) {
-    return get_term_link((int)$category_id, 'category');
+ * @param int $category Category ID, object, or slug.
+ * @return string Link on success, empty string if category does not exist.
+ */
+function get_category_link( $category ) {
+    return get_term_link( $category, 'category' );
 }
 
@@ -965 +965 @@
  * @see get_term_link()
  *
- * @param int $tag_id Tag (term) ID.
- * @return string|WP_Error Link on success, WP_Error if tag does not exist.
- */
-function get_tag_link( $tag_id ) {
-    return get_term_link( (int)$tag_id, 'post_tag');
+ * @param object|string|int $tag Tag ID, object, or slug.
+ * @return string Link on success, empty string if tag does not exist.
+ */
+function get_tag_link( $tag ) {
+    return get_term_link( $tag, 'post_tag' );
 }
 

branches/3.1/wp-includes/taxonomy.php

@@ -2816 +2816 @@
  * @param object|int|string $term
  * @param string $taxonomy (optional if $term is object)
- * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
+ * @return string HTML link to taxonomy term archive on success, empty string if term does not exist.
  */
 function get_term_link( $term, $taxonomy = '') {
@@ -2833 +2833 @@
 
     if ( is_wp_error( $term ) )
-        return $term;
+        return '';
 
     $taxonomy = $term->taxonomy;