Changeset 17443

Timestamp:

02/10/2011 09:48:40 PM (15 years ago)

Author:

ryan

Message:

Don't allow passing slugs to get_tag_link() and get_category_link(); they are too ambiguous. Restore WP_Error return to get_term_link(). fixes #16521 for trunk

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/category-template.php

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

trunk/wp-includes/taxonomy.php

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