<!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>[29863] trunk: Fix term_exists() for parent = 0.</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/29863">29863</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/29863","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>2014-10-09 02:48:47 +0000 (Thu, 09 Oct 2014)</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'>Fix term_exists() for parent = 0.
Passing a 0 (or '0') as the 'parent' param of term_exists() should limit
results to terms with no parent.
Adds unit test.
Fixes <a href="https://core.trac.wordpress.org/ticket/29851">#29851</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.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 2014-10-09 02:31:35 UTC (rev 29862)
+++ trunk/src/wp-includes/taxonomy.php 2014-10-09 02:48:47 UTC (rev 29863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1655,12 +1655,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $term The term to check
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The taxonomy name to use
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $parent ID of parent term under which to confine the exists search.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $parent Optional. ID of parent term under which to confine the exists search.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Returns 0 if the term does not exist. Returns the term ID if no taxonomy is specified
</span><span class="cx" style="display: block; padding: 0 10px"> * and the term ID exists. Returns an array of the term ID and the term taxonomy ID
</span><span class="cx" style="display: block; padding: 0 10px"> * if the taxonomy is specified and the pairing exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function term_exists($term, $taxonomy = '', $parent = 0) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function term_exists( $term, $taxonomy = '', $parent = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1686,8 +1686,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where_fields = array($slug);
</span><span class="cx" style="display: block; padding: 0 10px"> $else_where_fields = array($term);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($taxonomy) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = (int) $parent;
- if ( $parent > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_numeric( $parent ) ) {
+ $parent = (int) $parent;
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_fields[] = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $else_where_fields[] = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= ' AND tt.parent = %d';
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2014-10-09 02:31:35 UTC (rev 29862)
+++ trunk/tests/phpunit/tests/term.php 2014-10-09 02:48:47 UTC (rev 29863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +138,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</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 29851
+ */
+ public function test_term_exists_taxonomy_nonempty_parent_0_should_return_false_for_child_term() {
+ register_taxonomy( 'foo', 'post', array(
+ 'hierarchical' => true,
+ ) );
+
+ $parent_term = $this->factory->term->create( array(
+ 'taxonomy' => 'foo',
+ ) );
+
+ $t = $this->factory->term->create( array(
+ 'taxonomy' => 'foo',
+ 'parent' => $parent_term,
+ 'slug' => 'child-term',
+ ) );
+
+ $found = term_exists( 'child-term', 'foo', 0 );
+
+ _unregister_taxonomy( 'foo' );
+
+ $this->assertSame( null, $found['term_id'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span></span></pre>
</div>
</div>
</body>
</html>