Changeset 14711 for trunk/wp-includes/link-template.php

Timestamp:

05/17/2010 04:21:12 PM (16 years ago)

Author:

ryan

Message:

Introduce get_term_feed_link(). Use it in wp_list_categories(). Props blepoxp. see #13058

File:

• trunk/wp-includes/link-template.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -569 +569 @@
 */
 function get_category_feed_link($cat_id, $feed = '') {
-        $cat_id = (int) $cat_id;
-
-        $category = get_category($cat_id);
-
-        if ( empty($category) || is_wp_error($category) )
+        return get_term_feed_link($cat_id, 'category', $feed);
+}
+
+/**
+ * Retrieve the feed link for a taxonomy.
+ *
+ * Returns a link to the feed for all post in a given term. A specific feed
+ * can be requested or left blank to get the default 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_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
+        global $wp_rewrite;
+        
+        $term_id = ( int ) $term_id;
+
+        $term = get_term( $term_id, $taxonomy  );
+        
+        if ( empty( $term ) || is_wp_error( $term ) )
                 return false;
 
-        if ( empty($feed) )
+        if ( empty( $feed ) )
                 $feed = get_default_feed();
 
-        $permalink_structure = get_option('permalink_structure');
+        $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"); 
+                }
+                elseif ( 'post_tag' == $taxonomy ) {
+                        $link = home_url("?feed=$feed&tag=$term->slug"); 
+                } else {
+                        $t = get_taxonomy( $taxonomy );
+                        $link = home_url("?feed=$feed&$t->query_var=$term->slug");
+                }
         } else {
-                $link = get_category_link($cat_id);
-                if( $feed == get_default_feed() )
-                        $feed_link = 'feed';
-                else
-                        $feed_link = "feed/$feed";
-
-                $link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
-        }
-
-        $link = apply_filters('category_feed_link', $link, $feed);
-
-        return $link;
-}
-
-/**
- * Retrieve permalink for feed of tag.
- *
- * @since 2.3.0
- *
- * @param int $tag_id Tag ID.
- * @param string $feed Optional. Feed type.
- * @return string
- */
-function get_tag_feed_link($tag_id, $feed = '') {
-        $tag_id = (int) $tag_id;
-
-        $tag = get_tag($tag_id);
-
-        if ( empty($tag) || is_wp_error($tag) )
-                return false;
-
-        $permalink_structure = get_option('permalink_structure');
-
-        if ( empty($feed) )
-                $feed = get_default_feed();
-
-        if ( '' == $permalink_structure ) {
-                $link = home_url("?feed=$feed&tag=" . $tag->slug);
-        } else {
-                $link = get_tag_link($tag->term_id);
+                $link = get_term_link( $term_id, $term->taxonomy );
                 if ( $feed == get_default_feed() )
                         $feed_link = 'feed';
                 else
                         $feed_link = "feed/$feed";
-                $link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
-        }
-
-        $link = apply_filters('tag_feed_link', $link, $feed);
+
+                $link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+        }
+
+        if ( 'category' == $taxonomy )
+                $link = apply_filters( 'category_feed_link', $link, $feed );
+        elseif ( 'post_tag' == $taxonomy )
+                $link = apply_filters( 'category_feed_link', $link, $feed );
+        else
+                $link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+        
 
         return $link;
+}
+
+/**
+ * Retrieve permalink for feed of tag.
+ *
+ * @since 2.3.0
+ *
+ * @param int $tag_id Tag ID.
+ * @param string $feed Optional. Feed type.
+ * @return string
+ */
+function get_tag_feed_link($tag_id, $feed = '') {
+        return get_term_feed_link($tag_id, 'post_tag', $feed);
 }