Ticket #13058: 13058.diff

wp-includes/link-template.php

@@ -568 +568 @@
  * @return string Link to the feed for the category specified by $cat_id.
 */
 function get_category_feed_link($cat_id, $feed = '') {
-        $cat_id = (int) $cat_id;
+        return get_taxonomy_feed_link($cat_id, 'category', $feed);
+}
 
-        $category = get_category($cat_id);
+/**
+ * Retrieve the feed link for a taxonomy.
+ *
+ * Returns a link to the feed for all post in a given taxonomy. A specific feed
+ * can be requested or left blank to get the default feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 3.0
+ *
+ * @param int $term_id ID of a category.
+ * @param string $taxonomy Optional. Taxonomy of $term_id
+ * @param string $feed Optional. Feed type.
+ * @return string Link to the feed for the taxonomy specified by $term_id and $taxonomy.
+*/
+function get_taxonomy_feed_link($term_id, $taxonomy='category', $feed = '') {
+        $term_id = (int) $term_id;
 
-        if ( empty($category) || is_wp_error($category) )
+        $term = get_term($term_id, $taxonomy);
+        
+        if ( empty($term) || is_wp_error($term) )
                 return false;
 
         if ( empty($feed) )
@@ -581 +600 @@
         $permalink_structure = get_option('permalink_structure');
 
         if ( '' == $permalink_structure ) {
-                $link = home_url("?feed=$feed&cat=" . $cat_id);
+                if ( 'category' == $taxonomy ){
+                        $link = home_url("?feed=$feed&cat=" . $term_id);
+                }else{
+                        $link = home_url("?feed=$feed&".$term->taxonomy."=".$term->slug);
+                }
         } else {
-                $link = get_category_link($cat_id);
+                $link = get_term_link($term_id,$term->taxonomy);
                 if( $feed == get_default_feed() )
                         $feed_link = 'feed';
                 else
@@ -592 +615 @@
                 $link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
         }
 
-        $link = apply_filters('category_feed_link', $link, $feed);
+        if ( 'category' == $taxonomy ){
+                $link = apply_filters('category_feed_link', $link, $feed);
+        }else{
+                $link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
+        }
 
         return $link;
 }

wp-includes/classes.php

@@ -1452 +1452 @@
                         if ( empty($feed_image) )
                                 $link .= '(';
 
-                        $link .= '<a href="' . get_category_feed_link($category->term_id, $feed_type) . '"';
+                        $link .= '<a href="' . get_taxonomy_feed_link($category->term_id, $category->taxonomy, $feed_type) . '"';
 
                         if ( empty($feed) )
                                 $alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';

xmlrpc.php

@@ -2734 +2734 @@
                                 $struct['categoryDescription'] = $cat->description;
                                 $struct['categoryName'] = $cat->name;
                                 $struct['htmlUrl'] = esc_html(get_category_link($cat->term_id));
-                                $struct['rssUrl'] = esc_html(get_category_feed_link($cat->term_id, 'rss2'));
+                                $struct['rssUrl'] = esc_html(get_category_feed_link($cat->term_id, $cat->taxonomy, 'rss2'));
 
                                 $categories_struct[] = $struct;
                         }