<!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>[25936] branches/3.7: Fix the exclude_tree argument in get_terms(), which fixes the exclude argument in wp_list_categories().</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/25936">25936</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-26 19:00:57 +0000 (Sat, 26 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix the exclude_tree argument in get_terms(), which fixes the exclude argument in wp_list_categories().

Merges <a href="http://core.trac.wordpress.org/changeset/25933">[25933]</a> to the 3.7 branch.

This was a 3.7 regression caused by <a href="http://core.trac.wordpress.org/changeset/25162">[25162]</a>.

props dd32.
fixes <a href="http://core.trac.wordpress.org/ticket/25710">#25710</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpincludestaxonomyphp">branches/3.7/src/wp-includes/taxonomy.php</a></li>
<li><a href="#branches37testsphpunitteststermgetTermsphp">branches/3.7/tests/phpunit/tests/term/getTerms.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.7
</span><span class="cx">===================================================================
</span><del>--- branches/3.7        2013-10-26 17:47:33 UTC (rev 25935)
</del><ins>+++ branches/3.7 2013-10-26 19:00:57 UTC (rev 25936)
</ins><a id="branches37"></a>
<div class="propset"><h4>Property changes: branches/3.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929
</del><ins>+/trunk:18512,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933
</ins><span class="cx">\ No newline at end of property
</span><span class="cx">Index: branches/3.7/src
</span><span class="cx">===================================================================
</span><del>--- branches/3.7/src    2013-10-26 17:47:33 UTC (rev 25935)
</del><ins>+++ branches/3.7/src     2013-10-26 19:00:57 UTC (rev 25936)
</ins><a id="branches37src"></a>
<div class="propset"><h4>Property changes: branches/3.7/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1/src:18031
</span><span class="cx"> /branches/3.3/src:20543
</span><span class="cx"> /branches/3.4/src:21757
</span><del>-/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929
</del><ins>+/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933
</ins><span class="cx">\ No newline at end of property
</span><a id="branches37srcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/taxonomy.php (25935 => 25936)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/taxonomy.php        2013-10-26 17:47:33 UTC (rev 25935)
+++ branches/3.7/src/wp-includes/taxonomy.php   2013-10-26 19:00:57 UTC (rev 25936)
</span><span class="lines">@@ -1362,7 +1362,7 @@
</span><span class="cx">  $exclusions = '';
</span><span class="cx">  if ( ! empty( $exclude_tree ) ) {
</span><span class="cx">          $exclude_tree = wp_parse_id_list( $exclude_tree );
</span><del>-               $excluded_children = array();
</del><ins>+                $excluded_children = $exclude_tree;
</ins><span class="cx">           foreach ( $exclude_tree as $extrunk ) {
</span><span class="cx">                  $excluded_children = array_merge(
</span><span class="cx">                          $excluded_children,
</span></span></pre></div>
<a id="branches37testsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/tests/phpunit/tests/term/getTerms.php (25935 => 25936)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/tests/phpunit/tests/term/getTerms.php       2013-10-26 17:47:33 UTC (rev 25935)
+++ branches/3.7/tests/phpunit/tests/term/getTerms.php  2013-10-26 19:00:57 UTC (rev 25936)
</span><span class="lines">@@ -152,6 +152,38 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><ins>+        * @ticket 25710
+        */
+       function test_get_terms_exclude_tree() {
+
+               $term_id_uncategorized = get_option( 'default_category' );
+
+               $term_id1 = $this->factory->category->create();
+               $term_id11 = $this->factory->category->create( array( 'parent' => $term_id1 ) );
+               $term_id2 = $this->factory->category->create();
+               $term_id22 = $this->factory->category->create( array( 'parent' => $term_id2 ) );
+
+               // There's something else broken in the cache cleaning routines that leads to this having to be done manually
+               delete_option( 'category_children' );
+
+               $terms = get_terms( 'category', array(
+                       'exclude' => $term_id_uncategorized,
+                       'fields' => 'ids',
+                       'hide_empty' => false,
+               ) );
+               $this->assertEquals( array( $term_id1, $term_id11, $term_id2, $term_id22 ), $terms );
+
+               $terms = get_terms( 'category', array(
+                       'fields' => 'ids',
+                       'exclude_tree' => "$term_id1,$term_id_uncategorized",
+                       'hide_empty' => false,
+               ) );
+
+               $this->assertEquals( array( $term_id2, $term_id22 ), $terms );
+
+       }
+
+       /**
</ins><span class="cx">    * @ticket 13992
</span><span class="cx">   */
</span><span class="cx">  function test_get_terms_search() {
</span></span></pre>
</div>
</div>

</body>
</html>