<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14711] trunk/wp-includes: Introduce get_term_feed_link().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14711">14711</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-17 16:21:12 +0000 (Mon, 17 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce get_term_feed_link(). Use it in wp_list_categories(). Props blepoxp. see <a href="http://trac.wordpress.org/ticket/13058">#13058</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (14710 => 14711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-05-17 08:22:16 UTC (rev 14710)
+++ trunk/wp-includes/classes.php 2010-05-17 16:21:12 UTC (rev 14711)
</span><span class="lines">@@ -1356,7 +1356,7 @@
</span><span class="cx"> if ( empty($feed_image) )
</span><span class="cx"> $link .= '(';
</span><span class="cx">
</span><del>- $link .= '<a href="' . get_category_feed_link($category->term_id, $feed_type) . '"';
</del><ins>+ $link .= '<a href="' . get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) . '"';
</ins><span class="cx">
</span><span class="cx"> if ( empty($feed) )
</span><span class="cx"> $alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14710 => 14711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-05-17 08:22:16 UTC (rev 14710)
+++ trunk/wp-includes/link-template.php 2010-05-17 16:21:12 UTC (rev 14711)
</span><span class="lines">@@ -568,31 +568,64 @@
</span><span class="cx"> * @return string Link to the feed for the category specified by $cat_id.
</span><span class="cx"> */
</span><span class="cx"> function get_category_feed_link($cat_id, $feed = '') {
</span><del>- $cat_id = (int) $cat_id;
</del><ins>+ return get_term_feed_link($cat_id, 'category', $feed);
+}
</ins><span class="cx">
</span><del>- $category = get_category($cat_id);
</del><ins>+/**
+ * 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;
</ins><span class="cx">
</span><del>- if ( empty($category) || is_wp_error($category) )
</del><ins>+ $term = get_term( $term_id, $taxonomy );
+
+ if ( empty( $term ) || is_wp_error( $term ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty($feed) )
</del><ins>+ if ( empty( $feed ) )
</ins><span class="cx"> $feed = get_default_feed();
</span><span class="cx">
</span><del>- $permalink_structure = get_option('permalink_structure');
</del><ins>+ $permalink_structure = get_option( 'permalink_structure' );
</ins><span class="cx">
</span><span class="cx"> if ( '' == $permalink_structure ) {
</span><del>- $link = home_url("?feed=$feed&amp;cat=" . $cat_id);
</del><ins>+ if ( 'category' == $taxonomy ) {
+ $link = home_url("?feed=$feed&amp;cat=$term_id");
+ }
+ elseif ( 'post_tag' == $taxonomy ) {
+ $link = home_url("?feed=$feed&amp;tag=$term->slug");
+ } else {
+ $t = get_taxonomy( $taxonomy );
+ $link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
+ }
</ins><span class="cx"> } else {
</span><del>- $link = get_category_link($cat_id);
- if( $feed == get_default_feed() )
</del><ins>+ $link = get_term_link( $term_id, $term->taxonomy );
+ if ( $feed == get_default_feed() )
</ins><span class="cx"> $feed_link = 'feed';
</span><span class="cx"> else
</span><span class="cx"> $feed_link = "feed/$feed";
</span><span class="cx">
</span><del>- $link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
</del><ins>+ $link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $link = apply_filters('category_feed_link', $link, $feed);
</del><ins>+ 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 );
+
</ins><span class="cx">
</span><span class="cx"> return $link;
</span><span class="cx"> }
</span><span class="lines">@@ -607,32 +640,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_tag_feed_link($tag_id, $feed = '') {
</span><del>- $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&amp;tag=" . $tag->slug);
- } else {
- $link = get_tag_link($tag->term_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('tag_feed_link', $link, $feed);
-
- return $link;
</del><ins>+ return get_term_feed_link($tag_id, 'post_tag', $feed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>