<!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>[31378] branches/4.1: In `wp_update_term()`, limit duplicate slug checks to the same taxonomy as the updated term.</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/31378">31378</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/31378","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 03:58:35 +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'>In `wp_update_term()`, limit duplicate slug checks to the same taxonomy as the updated term.
In 4.1 <a href="https://core.trac.wordpress.org/changeset/30240">[30240]</a>, `wp_insert_term()` was modified to allow the creation of terms
with duplicate slugs, as long as the terms are in different taxonomies.
`wp_update_term()` didn't get the corresponding modification, with the result
that term updates fail when the term being updated shares a slug with an older
term, regardless of that older term's taxonomy.
Props ipm-frommen.
Merges <a href="https://core.trac.wordpress.org/changeset/30985">[30985]</a> to the 4.1 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/30780">#30780</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpincludestaxonomyphp">branches/4.1/src/wp-includes/taxonomy.php</a></li>
<li><a href="#branches41testsphpunitteststermphp">branches/4.1/tests/phpunit/tests/term.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:32:31 UTC (rev 31377)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2015-02-09 03:58:35 UTC (rev 31378)
</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,31140,31197,31251
</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,30985,30993,31010,31054,31071,31073,31140,31197,31251
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpincludestaxonomyphp"></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-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-includes/taxonomy.php 2015-02-09 02:32:31 UTC (rev 31377)
+++ branches/4.1/src/wp-includes/taxonomy.php 2015-02-09 03:58:35 UTC (rev 31378)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3353,8 +3353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for duplicate slug
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE slug = %s", $slug ) );
- if ( $id && ($id != $term_id) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $duplicate = get_term_by( 'slug', $slug, $taxonomy );
+ if ( $duplicate && $duplicate->term_id != $term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an empty slug was passed or the parent changed, reset the slug to something unique.
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $empty_slug || ( $parent != $term['parent']) )
</span></span></pre></div>
<a id="branches41testsphpunitteststermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/tests/phpunit/tests/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/term.php 2015-02-09 02:32:31 UTC (rev 31377)
+++ branches/4.1/tests/phpunit/tests/term.php 2015-02-09 03:58:35 UTC (rev 31378)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +640,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5809
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_update_term_duplicate_slug_same_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_term_should_not_create_duplicate_slugs_within_the_same_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t1 = $this->factory->term->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,7 +650,7 @@
</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"> $t2 = $this->factory->term->create( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Foo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Bar',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,7 +666,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5809
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_update_term_duplicate_slug_different_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_term_should_allow_duplicate_slugs_in_different_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,10 +686,80 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</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">- $this->assertWPError( $updated );
- $this->assertSame( 'duplicate_term_slug', $updated->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( is_wp_error( $updated ) );
+
+ $t1_term = get_term( $t1, 'wptests_tax' );
+ $t2_term = get_term( $t2, 'wptests_tax_2' );
+ $this->assertSame( $t1_term->slug, $t2_term->slug );
</ins><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 30780
+ */
+ public function test_wp_update_term_should_allow_duplicate_names_in_different_taxonomies() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ register_taxonomy( 'wptests_tax_2', 'post' );
+
+ $t1 = $this->factory->term->create( array(
+ 'name' => 'Foo',
+ 'slug' => 'foo',
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $t2 = $this->factory->term->create( array(
+ 'name' => 'Bar',
+ 'slug' => 'bar',
+ 'taxonomy' => 'wptests_tax_2',
+ ) );
+
+ $updated = wp_update_term( $t2, 'wptests_tax_2', array(
+ 'name' => 'Foo',
+ ) );
+
+ $this->assertFalse( is_wp_error( $updated ) );
+
+ $t2_term = get_term( $t2, 'wptests_tax_2' );
+ $this->assertSame( 'Foo', $t2_term->name );
+ }
+
+ /**
+ * @ticket 30780
+ */
+ public function test_wp_update_term_should_allow_duplicate_names_at_different_levels_of_the_same_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post', array(
+ 'hierarchical' => true,
+ ) );
+
+ $t1 = $this->factory->term->create( array(
+ 'name' => 'Foo',
+ 'slug' => 'foo',
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $t2 = $this->factory->term->create( array(
+ 'name' => 'Bar',
+ 'slug' => 'bar',
+ 'taxonomy' => 'wptests_tax',
+ 'parent' => $t1,
+ ) );
+
+ $t3 = $this->factory->term->create( array(
+ 'name' => 'Bar Child',
+ 'slug' => 'bar-child',
+ 'taxonomy' => 'wptests_tax',
+ 'parent' => $t2,
+ ) );
+
+ $updated = wp_update_term( $t3, 'wptests_tax', array(
+ 'name' => 'Bar',
+ ) );
+
+ $this->assertFalse( is_wp_error( $updated ) );
+
+ $t3_term = get_term( $t3, 'wptests_tax' );
+ $this->assertSame( 'Bar', $t3_term->name );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_alias_of_no_term_group() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $t1 = $this->factory->term->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1605,6 +1675,76 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $cat_id2 );
</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 30780
+ */
+ public function test_wp_update_term_should_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_term_with_the_same_slug() {
+ register_taxonomy( 'wptests_tax', 'post', array(
+ 'hierarchical' => true,
+ ) );
+ register_taxonomy( 'wptests_tax_2', 'post', array(
+ 'hierarchical' => true,
+ ) );
+
+ $t1 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'parent-term',
+ ) );
+
+ $t2 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'foo',
+ ) );
+
+ wp_update_term( $t2, 'wptests_tax', array(
+ 'parent' => $t1,
+ ) );
+
+ $t2_term = get_term( $t2, 'wptests_tax' );
+
+ $this->assertSame( 'foo', $t2_term->slug );
+
+ _unregister_taxonomy( 'wptests_tax' );
+ }
+
+ /**
+ * @ticket 30780
+ */
+ public function test_wp_update_term_should_not_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_slug_conflict_within_the_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post', array(
+ 'hierarchical' => true,
+ ) );
+ register_taxonomy( 'wptests_tax_2', 'post', array(
+ 'hierarchical' => true,
+ ) );
+
+ $t1 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'parent-term',
+ ) );
+
+ // Same slug but in a different tax.
+ $t2 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax_2',
+ 'slug' => 'foo',
+ ) );
+
+ $t3 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'foo',
+ ) );
+
+ wp_update_term( $t3, 'wptests_tax', array(
+ 'parent' => $t1,
+ ) );
+
+ $t3_term = get_term( $t3, 'wptests_tax' );
+
+ $this->assertSame( 'foo', $t3_term->slug );
+
+ _unregister_taxonomy( 'wptests_tax' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Helpers **********************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _pre_insert_term_callback() {
</span></span></pre>
</div>
</div>
</body>
</html>