<!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>[31376] branches/4.1: Default `$parent` in `category_exists()` should default to null rather than 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/31376">31376</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/31376","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-09 02:21:26 +0000 (Mon, 09 Feb 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'>Default `$parent` in `category_exists()` should default to null rather than 0.
<a href="https://core.trac.wordpress.org/changeset/29863">[29863]</a> made the corresponding change in `term_exists()`. Failure to change the
default value in `category_exists()` meant that an unspecified value for
`$parent` would limit results to top-level categories.
Includes unit tests and corrected function documentation.
Props hissy.
Merges <a href="https://core.trac.wordpress.org/changeset/31140">[31140]</a> to the 4.1 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/30975">#30975</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpadminincludestaxonomyphp">branches/4.1/src/wp-admin/includes/taxonomy.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches41testsphpunitteststermcategoryExistsphp">branches/4.1/tests/phpunit/tests/term/categoryExists.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.1 2015-02-09 02:09:43 UTC (rev 31375)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2015-02-09 02:21:26 UTC (rev 31376)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30993,31010,31054,31071,31073,31197
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30993,31010,31054,31071,31073,31140,31197
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/includes/taxonomy.php 2015-02-09 02:09:43 UTC (rev 31375)
+++ branches/4.1/src/wp-admin/includes/taxonomy.php 2015-02-09 02:21:26 UTC (rev 31376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,14 +11,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * {@internal Missing Short Description}}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check whether a category exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|string $cat_name
- * @return int
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see term_exists()
+ *
+ * @param int|string $cat_name Category name.
+ * @param int $parent Optional. ID of parent term.
+ * @return mixed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function category_exists($cat_name, $parent = 0) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function category_exists( $cat_name, $parent = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = term_exists($cat_name, 'category', $parent);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array($id) )
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $id['term_id'];
</span></span></pre></div>
<a id="branches41testsphpunitteststermcategoryExistsphpfromrev31140trunktestsphpunitteststermcategoryExistsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/4.1/tests/phpunit/tests/term/categoryExists.php (from rev 31140, trunk/tests/phpunit/tests/term/categoryExists.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/term/categoryExists.php (rev 0)
+++ branches/4.1/tests/phpunit/tests/term/categoryExists.php 2015-02-09 02:21:26 UTC (rev 31376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,77 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+class Tests_Term_CategoryExists extends WP_UnitTestCase {
+ /**
+ * @ticket 30975
+ */
+ public function test_category_exists_should_return_only_top_level_categories_when_parent_is_0() {
+ $c1 = $this->factory->category->create();
+ $c2 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ 'parent' => $c1,
+ ) );
+ $c3 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ ) );
+
+ $found = category_exists( 'Foo', 0 );
+
+ $this->assertEquals( $found, $c3 );
+ }
+
+ /**
+ * @ticket 30975
+ */
+ public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_1() {
+ // Foo child of c1 is created first.
+ $c1 = $this->factory->category->create();
+ $c2 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ 'parent' => $c1,
+ ) );
+ $c3 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ ) );
+
+ $found = category_exists( 'Foo' );
+
+ $this->assertEquals( $found, $c2 );
+ }
+
+ /**
+ * @ticket 30975
+ */
+ public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_2() {
+ // Top-level Foo is created first.
+ $c1 = $this->factory->category->create();
+ $c2 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ ) );
+ $c3 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ 'parent' => $c1,
+ ) );
+
+ $found = category_exists( 'Foo' );
+
+ $this->assertEquals( $found, $c2 );
+ }
+
+ /**
+ * @ticket 30975
+ */
+ public function test_category_exists_should_respect_nonempty_parent() {
+ $c1 = $this->factory->category->create();
+ $c2 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ 'parent' => $c1,
+ ) );
+ $c3 = $this->factory->category->create( array(
+ 'name' => 'Foo',
+ ) );
+
+ $found = category_exists( 'Foo', $c1 );
+
+ $this->assertEquals( $found, $c2 );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>