<!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>[17526] trunk/wp-includes:
Return false instead of WP_Error from get_term_by()
if the term does not exist.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17526">17526</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-03-22 20:06:38 +0000 (Tue, 22 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return false instead of WP_Error from get_term_by() if the term does not exist. Makes fetching a term by id consistent with slug and name. Props hakre. fixes <a href="http://trac.wordpress.org/ticket/16464">#16464</a> <a href="http://trac.wordpress.org/ticket/16717">#16717</a> for trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (17525 => 17526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-03-22 00:04:15 UTC (rev 17525)
+++ trunk/wp-includes/query.php 2011-03-22 20:06:38 UTC (rev 17526)
</span><span class="lines">@@ -2190,7 +2190,7 @@
</span><span class="cx"> if ( !empty( $cat_query ) ) {
</span><span class="cx"> $cat_query = reset( $cat_query );
</span><span class="cx"> $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
</span><del>- if ( $the_cat && ! is_wp_error( $the_cat ) ) {
</del><ins>+ if ( $the_cat ) {
</ins><span class="cx"> $this->set( 'cat', $the_cat->term_id );
</span><span class="cx"> $this->set( 'category_name', $the_cat->slug );
</span><span class="cx"> }
</span><span class="lines">@@ -2202,7 +2202,7 @@
</span><span class="cx"> if ( !empty( $tag_query ) ) {
</span><span class="cx"> $tag_query = reset( $tag_query );
</span><span class="cx"> $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
</span><del>- if ( $the_tag && ! is_wp_error( $the_tag ) ) {
</del><ins>+ if ( $the_tag ) {
</ins><span class="cx"> $this->set( 'tag_id', $the_tag->term_id );
</span><span class="cx"> }
</span><span class="cx"> unset( $the_tag );
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (17525 => 17526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-03-22 00:04:15 UTC (rev 17525)
+++ trunk/wp-includes/taxonomy.php 2011-03-22 20:06:38 UTC (rev 17526)
</span><span class="lines">@@ -889,7 +889,10 @@
</span><span class="cx"> $value = stripslashes($value);
</span><span class="cx"> $field = 't.name';
</span><span class="cx"> } else {
</span><del>- return get_term( (int) $value, $taxonomy, $output, $filter);
</del><ins>+ $term = get_term( (int) $value, $taxonomy, $output, $filter);
+ if ( is_wp_error( $term ) )
+ $term = false;
+ return $term;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND $field = %s LIMIT 1", $taxonomy, $value) );
</span></span></pre>
</div>
</div>
</body>
</html>