<!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>[31270] trunk: Introduce 'parent' parameter to `wp_get_object_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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31270">31270</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31270","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-23 14:56:04 +0000 (Fri, 23 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Introduce 'parent' parameter to `wp_get_object_terms()`.
Props mikeschinkel.
Fixes <a href="https://core.trac.wordpress.org/ticket/15675">#15675</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2015-01-22 14:45:14 UTC (rev 31269)
+++ trunk/src/wp-includes/taxonomy.php 2015-01-23 14:56:04 UTC (rev 31270)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2555,6 +2555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0 Added support for 'taxonomy', 'parent', and 'term_taxonomy_id' values of `$orderby`.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Introduced `$parent` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2569,6 +2570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'all_with_object_id'. Note that 'all' or 'all_with_object_id' will result in an array of
</span><span class="cx" style="display: block; padding: 0 10px"> * term objects being returned, 'ids' will return an array of integers, and 'names' an array
</span><span class="cx" style="display: block; padding: 0 10px"> * of strings.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int $parent Optional. Limit results to the direct children of a given term ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error The requested term data or empty array if no terms found.
</span><span class="cx" style="display: block; padding: 0 10px"> * WP_Error if any of the $taxonomies don't exist.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2591,7 +2593,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $object_ids = array($object_ids);
</span><span class="cx" style="display: block; padding: 0 10px"> $object_ids = array_map('intval', $object_ids);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $defaults = array(
+ 'orderby' => 'name',
+ 'order' => 'ASC',
+ 'fields' => 'all',
+ 'parent' => '',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2652,8 +2659,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'all_with_object_id' == $fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $select_this = 't.*, tt.*, tr.object_id';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = array(
+ "tt.taxonomy IN ($taxonomies)",
+ "tr.object_id IN ($object_ids)",
+ );
+
+ if ( '' !== $args['parent'] ) {
+ $where[] = $wpdb->prepare( 'tt.parent = %d', $args['parent'] );
+ }
+
+ $where = implode( ' AND ', $where );
+
+ $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE $where $orderby $order";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $objects = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms = $wpdb->get_results( $query );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGetObjectTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2015-01-22 14:45:14 UTC (rev 31269)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2015-01-23 14:56:04 UTC (rev 31270)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,6 +356,68 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $t2, $t3, $t1 ), $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 15675
+ */
+ public function test_parent() {
+ $t1 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ ) );
+ $t2 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ ) );
+ $t3 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ 'parent' => $t1,
+ ) );
+ $t4 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ 'parent' => $t2,
+ ) );
+
+ $p = $this->factory->post->create();
+
+ wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
+
+ $found = wp_get_object_terms( $p, $this->taxonomy, array(
+ 'parent' => $t1,
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEquals( array( $t3 ), $found );
+ }
+
+ /**
+ * @ticket 15675
+ */
+ public function test_parent_0() {
+ $t1 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ ) );
+ $t2 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ ) );
+ $t3 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ 'parent' => $t1,
+ ) );
+ $t4 = $this->factory->term->create( array(
+ 'taxonomy' => $this->taxonomy,
+ 'parent' => $t2,
+ ) );
+
+ $p = $this->factory->post->create();
+
+ wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
+
+ $found = wp_get_object_terms( $p, $this->taxonomy, array(
+ 'parent' => 0,
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEqualSets( array( $t1, $t2 ), $found );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function filter_get_object_terms( $terms ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = wp_list_pluck( $terms, 'term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> // all terms should still be objects
</span></span></pre>
</div>
</div>
</body>
</html>