Changeset 17444 for branches/3.1/wp-includes/category-template.php

Timestamp:

02/10/2011 09:49:30 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 3.1

File:

• branches/3.1/wp-includes/category-template.php (modified) (2 diffs)

branches/3.1/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;
 }