<!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>[16665] trunk/wp-includes/taxonomy.php: Get rid of misplaced '
taxonomy_template' filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16665">16665</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-01 20:16:24 +0000 (Wed, 01 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of misplaced 'taxonomy_template' filter. Fixes <a href="http://trac.wordpress.org/ticket/14740">#14740</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16664 => 16665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-01 20:14:52 UTC (rev 16664)
+++ trunk/wp-includes/taxonomy.php 2010-12-01 20:16:24 UTC (rev 16665)
</span><span class="lines">@@ -2775,6 +2775,7 @@
</span><span class="cx"> * 'before' : default is empty string. Display before taxonomies list.
</span><span class="cx"> * 'sep' : default is empty string. Separate every taxonomy with value in this.
</span><span class="cx"> * 'after' : default is empty string. Display this after the taxonomies list.
</span><ins>+ * 'template' : The template to use for displaying the taxonomy terms.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> * @uses get_the_taxonomies()
</span><span class="lines">@@ -2787,12 +2788,13 @@
</span><span class="cx"> 'before' => '',
</span><span class="cx"> 'sep' => ' ',
</span><span class="cx"> 'after' => '',
</span><ins>+ 'template' => '%s: %l.'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- echo $before . join($sep, get_the_taxonomies($post)) . $after;
</del><ins>+ echo $before . join($sep, get_the_taxonomies($post, $template)) . $after;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2804,9 +2806,10 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $post Optional. Post ID or will use Global Post ID (in loop).
</span><ins>+ * @param string $template Optional. The template to use for displaying the taxonomy terms.
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function get_the_taxonomies($post = 0) {
</del><ins>+function get_the_taxonomies($post = 0, $template = '%s: %l.') {
</ins><span class="cx"> if ( is_int($post) )
</span><span class="cx"> $post =& get_post($post);
</span><span class="cx"> elseif ( !is_object($post) )
</span><span class="lines">@@ -2817,8 +2820,6 @@
</span><span class="cx"> if ( !$post )
</span><span class="cx"> return $taxonomies;
</span><span class="cx">
</span><del>- $template = apply_filters('taxonomy_template', '%s: %l.');
-
</del><span class="cx"> foreach ( get_object_taxonomies($post) as $taxonomy ) {
</span><span class="cx"> $t = (array) get_taxonomy($taxonomy);
</span><span class="cx"> if ( empty($t['label']) )
</span></span></pre>
</div>
</div>
</body>
</html>