<!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>[15586] trunk/wp-includes: Make the second (taxonomy)
parameter for get_term_link()
optional if you pass in a term object as the first argument (
which has the taxonomy in it).</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15586">15586</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-09-07 04:29:00 +0000 (Tue, 07 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the second (taxonomy) parameter for get_term_link() optional if you pass in a term object as the first argument (which has the taxonomy in it). fixes <a href="http://trac.wordpress.org/ticket/13081">#13081</a>. props scribu</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.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 (15585 => 15586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-09-07 04:22:56 UTC (rev 15585)
+++ trunk/wp-includes/classes.php 2010-09-07 04:29:00 UTC (rev 15586)
</span><span class="lines">@@ -1340,9 +1340,9 @@
</span><span class="cx"> function start_el(&$output, $category, $depth, $args) {
</span><span class="cx"> extract($args);
</span><span class="cx">
</span><del>- $cat_name = esc_attr( $category->name);
</del><ins>+ $cat_name = esc_attr( $category->name );
</ins><span class="cx"> $cat_name = apply_filters( 'list_cats', $cat_name, $category );
</span><del>- $link = '<a href="' . get_term_link( $category, $category->taxonomy ) . '" ';
</del><ins>+ $link = '<a href="' . esc_attr( get_term_link($category) ) . '" ';
</ins><span class="cx"> if ( $use_desc_for_title == 0 || empty($category->description) )
</span><span class="cx"> $link .= 'title="' . sprintf(__( 'View all posts filed under %s' ), $cat_name) . '"';
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15585 => 15586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-09-07 04:22:56 UTC (rev 15585)
+++ trunk/wp-includes/taxonomy.php 2010-09-07 04:29:00 UTC (rev 15586)
</span><span class="lines">@@ -2481,10 +2481,10 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param object|int|string $term
</span><del>- * @param string $taxonomy
</del><ins>+ * @param string $taxonomy (optional if $term is object)
</ins><span class="cx"> * @return string HTML link to taxonomy term archive
</span><span class="cx"> */
</span><del>-function get_term_link( $term, $taxonomy ) {
</del><ins>+function get_term_link( $term, $taxonomy = '') {
</ins><span class="cx"> global $wp_rewrite;
</span><span class="cx">
</span><span class="cx"> if ( !is_object($term) ) {
</span><span class="lines">@@ -2501,6 +2501,8 @@
</span><span class="cx"> if ( is_wp_error( $term ) )
</span><span class="cx"> return $term;
</span><span class="cx">
</span><ins>+ $taxonomy = $term->taxonomy;
+
</ins><span class="cx"> // use legacy functions for core taxonomies until they are fully plugged in
</span><span class="cx"> if ( $taxonomy == 'category' )
</span><span class="cx"> return get_category_link((int) $term->term_id);
</span><span class="lines">@@ -2597,7 +2599,7 @@
</span><span class="cx"> $links = array();
</span><span class="cx">
</span><span class="cx"> foreach ( $terms as $term )
</span><del>- $links[] = "<a href='" . esc_attr(get_term_link($term, $taxonomy)) . "'>$term->name</a>";
</del><ins>+ $links[] = "<a href='" . esc_attr( get_term_link($term) ) . "'>$term->name</a>";
</ins><span class="cx">
</span><span class="cx"> if ( $links )
</span><span class="cx"> $taxonomies[$taxonomy] = wp_sprintf($t['template'], $t['label'], $links, $terms);
</span></span></pre>
</div>
</div>
</body>
</html>