<!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>[17444] branches/3.1/wp-includes: Don't allow passing slugs to get_tag_link
() and get_category_link(); they are too ambiguous.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17444">17444</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-02-10 21:49:30 +0000 (Thu, 10 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't allow passing slugs to get_tag_link() and get_category_link(); they are too ambiguous. Restore WP_Error return to get_term_link(). fixes <a href="http://trac.wordpress.org/ticket/16521">#16521</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludescategorytemplatephp">branches/3.1/wp-includes/category-template.php</a></li>
<li><a href="#branches31wpincludestaxonomyphp">branches/3.1/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/category-template.php (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/category-template.php 2011-02-10 21:48:40 UTC (rev 17443)
+++ branches/3.1/wp-includes/category-template.php 2011-02-10 21:49:30 UTC (rev 17444)
</span><span class="lines">@@ -12,11 +12,19 @@
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> * @see get_term_link()
</span><span class="cx"> *
</span><del>- * @param int $category Category ID, object, or slug.
</del><ins>+ * @param int|object $category Category ID or object.
</ins><span class="cx"> * @return string Link on success, empty string if category does not exist.
</span><span class="cx"> */
</span><span class="cx"> function get_category_link( $category ) {
</span><del>- return get_term_link( $category, 'category' );
</del><ins>+ if ( ! is_object( $category ) )
+ $category = (int) $category;
+
+ $category = get_term_link( $category, 'category' );
+
+ if ( is_wp_error( $category ) )
+ return '';
+
+ return $category;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -964,11 +972,19 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @see get_term_link()
</span><span class="cx"> *
</span><del>- * @param object|string|int $tag Tag ID, object, or slug.
</del><ins>+ * @param int|object $tag Tag ID or object.
</ins><span class="cx"> * @return string Link on success, empty string if tag does not exist.
</span><span class="cx"> */
</span><span class="cx"> function get_tag_link( $tag ) {
</span><del>- return get_term_link( $tag, 'post_tag' );
</del><ins>+ if ( ! is_object( $tag ) )
+ $tag = (int) $tag;
+
+ $tag = get_term_link( $tag, 'post_tag' );
+
+ if ( is_wp_error( $tag ) )
+ return '';
+
+ return $tag;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches31wpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/taxonomy.php (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/taxonomy.php 2011-02-10 21:48:40 UTC (rev 17443)
+++ branches/3.1/wp-includes/taxonomy.php 2011-02-10 21:49:30 UTC (rev 17444)
</span><span class="lines">@@ -2815,7 +2815,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object|int|string $term
</span><span class="cx"> * @param string $taxonomy (optional if $term is object)
</span><del>- * @return string HTML link to taxonomy term archive on success, empty string if term does not exist.
</del><ins>+ * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
</ins><span class="cx"> */
</span><span class="cx"> function get_term_link( $term, $taxonomy = '') {
</span><span class="cx"> global $wp_rewrite;
</span><span class="lines">@@ -2832,7 +2832,7 @@
</span><span class="cx"> $term = new WP_Error('invalid_term', __('Empty Term'));
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $term ) )
</span><del>- return '';
</del><ins>+ return $term;
</ins><span class="cx">
</span><span class="cx"> $taxonomy = $term->taxonomy;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>