<!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" />
<title>[25161] trunk: Support `id=>name` and `id=>slug` values for `fields` arg in `get_terms()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25161">25161</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-08-29 15:18:08 +0000 (Thu, 29 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support `id=>name` and `id=>slug` values for `fields` arg in `get_terms()`. Adds unit tests.
Props mikeschinkel.
Fixes <a href="http://core.trac.wordpress.org/ticket/13661">#13661</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkteststeststermgetTermsphp">trunk/tests/tests/term/getTerms.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunktestsdata">trunk/tests/data/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (25160 => 25161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-08-29 15:07:59 UTC (rev 25160)
+++ trunk/src/wp-includes/taxonomy.php 2013-08-29 15:18:08 UTC (rev 25161)
</span><span class="lines">@@ -1383,19 +1383,26 @@
</span><span class="cx"> $selects = array();
</span><span class="cx"> switch ( $fields ) {
</span><span class="cx"> case 'all':
</span><del>- $selects = array('t.*', 'tt.*');
</del><ins>+ $selects = array( 't.*', 'tt.*' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'ids':
</span><span class="cx"> case 'id=>parent':
</span><del>- $selects = array('t.term_id', 'tt.parent', 'tt.count');
</del><ins>+ $selects = array( 't.term_id', 'tt.parent', 'tt.count' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'names':
</span><del>- $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
</del><ins>+ $selects = array( 't.term_id', 'tt.parent', 'tt.count', 't.name' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'count':
</span><span class="cx"> $orderby = '';
</span><span class="cx"> $order = '';
</span><del>- $selects = array('COUNT(*)');
</del><ins>+ $selects = array( 'COUNT(*)' );
+ break;
+ case 'id=>name':
+ $selects = array( 't.term_id', 't.name' );
+ break;
+ case 'id=>slug':
+ $selects = array( 't.term_id', 't.slug' );
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $_fields = $fields;
</span><span class="lines">@@ -1454,29 +1461,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- reset ( $terms );
</del><ins>+ reset( $terms );
</ins><span class="cx">
</span><span class="cx"> $_terms = array();
</span><span class="cx"> if ( 'id=>parent' == $fields ) {
</span><del>- while ( $term = array_shift($terms) )
</del><ins>+ while ( $term = array_shift( $terms ) )
</ins><span class="cx"> $_terms[$term->term_id] = $term->parent;
</span><del>- $terms = $_terms;
</del><span class="cx"> } elseif ( 'ids' == $fields ) {
</span><del>- while ( $term = array_shift($terms) )
</del><ins>+ while ( $term = array_shift( $terms ) )
</ins><span class="cx"> $_terms[] = $term->term_id;
</span><del>- $terms = $_terms;
</del><span class="cx"> } elseif ( 'names' == $fields ) {
</span><del>- while ( $term = array_shift($terms) )
</del><ins>+ while ( $term = array_shift( $terms ) )
</ins><span class="cx"> $_terms[] = $term->name;
</span><del>- $terms = $_terms;
</del><ins>+ } elseif ( 'id=>name' == $fields ) {
+ while ( $term = array_shift( $terms ) )
+ $_terms[$term->term_id] = $term->name;
+ } elseif ( 'id=>slug' == $fields ) {
+ while ( $term = array_shift( $terms ) )
+ $_terms[$term->term_id] = $term->slug;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! empty( $_terms ) )
+ $terms = $_terms;
+
</ins><span class="cx"> if ( $number && is_array( $terms ) && count( $terms ) > $number )
</span><span class="cx"> $terms = array_slice( $terms, $offset, $number );
</span><span class="cx">
</span><span class="cx"> wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
</span><span class="cx">
</span><del>- $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
</del><ins>+ $terms = apply_filters( 'get_terms', $terms, $taxonomies, $args );
</ins><span class="cx"> return $terms;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">Index: trunk/tests/data
</span><span class="cx">===================================================================
</span><del>--- trunk/tests/data 2013-08-29 15:07:59 UTC (rev 25160)
</del><ins>+++ trunk/tests/data 2013-08-29 15:18:08 UTC (rev 25161)
</ins></span></pre></div>
<a id="trunktestsdata"></a>
<div class="propset"><h4>Property changes: trunk/tests/data</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<ins>+.trac-ticket-cache.core.trac.wordpress.org
+.trac-ticket-cache.unit-tests.trac.wordpress.org
</ins><a id="trunkteststeststermgetTermsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/tests/term/getTerms.php (25160 => 25161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/tests/term/getTerms.php 2013-08-29 15:07:59 UTC (rev 25160)
+++ trunk/tests/tests/term/getTerms.php 2013-08-29 15:18:08 UTC (rev 25161)
</span><span class="lines">@@ -87,4 +87,36 @@
</span><span class="cx"> $terms = get_terms( array( '111' => 'post_tag' ), array( 'hide_empty' => false ) );
</span><span class="cx"> $this->assertEquals( $term_id, $terms[0]->term_id );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 13661
+ */
+ function test_get_terms_fields() {
+ $term_id1 = $this->factory->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+ $term_id2 = $this->factory->tag->create( array( 'slug' => 'hoo', 'name' => 'HOO!', 'parent' => $term_id1 ) );
+
+ $terms_id_parent = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
+ $this->assertEquals( array(
+ $term_id1 => 0,
+ $term_id2 => $term_id1
+ ), $terms_id_parent );
+
+ $terms_ids = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'ids' ) );
+ $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms_ids );
+
+ $terms_name = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'names' ) );
+ $this->assertEqualSets( array( 'WOO!', 'HOO!' ), $terms_name );
+
+ $terms_id_name = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'id=>name' ) );
+ $this->assertEquals( array(
+ $term_id1 => 'WOO!',
+ $term_id2 => 'HOO!',
+ ), $terms_id_name );
+
+ $terms_id_slug = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'id=>slug' ) );
+ $this->assertEquals( array(
+ $term_id1 => 'woo',
+ $term_id2 => 'hoo'
+ ), $terms_id_slug );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>