<!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>[30240] trunk: Do not create shared taxonomy 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/30240">30240</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/30240","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-11-05 01:41:58 +0000 (Wed, 05 Nov 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'>Do not create shared taxonomy terms.
A "shared" term occurs when two entries in the `wp_term_taxonomy` table share a
single `term_id`, and thereby correspond to the same row in `wp_terms`. This
changeset stops the practice of creating shared terms: each new row in
`wp_term_taxonomy` will receive its own row in `wp_terms`. The new strategy
for term creation depends on whether the installation's database schema is up
to date for 4.1:
* If so, terms are allowed to be created with the same slug as an existing term, as long as they are in different taxonomies and do not share a parent. Thus, a new tag with the slug 'wordpress' can exist alongside a category with the slug 'wordpress'.
* If not, new terms will be forced to have unique slugs. Thus, on an installation containing a category with the slug 'wordpress', a new tag 'WordPress' will get the slug 'wordpress-2'.
Fixes <a href="https://core.trac.wordpress.org/ticket/21950">#21950</a>. See <a href="https://core.trac.wordpress.org/ticket/5809">#5809</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-11-05 01:08:44 UTC (rev 30239)
+++ trunk/src/wp-includes/taxonomy.php 2014-11-05 01:41:58 UTC (rev 30240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2845,45 +2845,32 @@
</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">- if ( $term_id = term_exists($slug) ) {
- $existing_term = $wpdb->get_row( $wpdb->prepare( "SELECT name FROM $wpdb->terms WHERE term_id = %d", $term_id), ARRAY_A );
- // We've got an existing term in the same taxonomy, which matches the name of the new term:
- if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && $exists = term_exists( (int) $term_id, $taxonomy ) ) {
- // Hierarchical, and it matches an existing term, Do not allow same "name" in the same level.
- $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => $parent ) );
- if ( in_array($name, $siblings) ) {
- if ( $slug_provided ) {
- return new WP_Error( 'term_exists', __( 'A term with the name and slug provided already exists with this parent.' ), $exists['term_id'] );
- } else {
- return new WP_Error( 'term_exists', __( 'A term with the name provided already exists with this parent.' ), $exists['term_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Terms with duplicate names are not allowed at the same level of a taxonomy hierarchy.
+ if ( $exists = term_exists( $slug, $taxonomy ) ) {
+ $existing_term = get_term( $exists['term_id'], $taxonomy );
+
+ if ( $name === $existing_term->name ) {
+
+ if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+ $siblings = get_terms( $taxonomy, array( 'fields' => 'names', 'get' => 'all', 'parent' => $parent ) );
+ if ( in_array( $name, $siblings ) ) {
+ return new WP_Error( 'term_exists', __( 'A term with the name and slug already exists with this parent.' ), $exists['term_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug = wp_unique_term_slug($slug, (object) $args);
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- }
- $term_id = (int) $wpdb->insert_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'term_exists', __( 'A term with the name and slug already exists in this taxonomy.' ), $exists['term_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $existing_term['name'] != $name ) {
- // We've got an existing term, with a different name, Create the new term.
- $slug = wp_unique_term_slug($slug, (object) $args);
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- }
- $term_id = (int) $wpdb->insert_id;
- } elseif ( $exists = term_exists( (int) $term_id, $taxonomy ) ) {
- // Same name, same slug.
- return new WP_Error( 'term_exists', __( 'A term with the name and slug provided already exists.' ), $exists['term_id'] );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- // This term does not exist at all in the database, Create it.
- $slug = wp_unique_term_slug($slug, (object) $args);
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- }
- $term_id = (int) $wpdb->insert_id;
</del><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">+ $slug = wp_unique_term_slug( $slug, (object) $args );
+
+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
+ return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error );
+ }
+
+ $term_id = (int) $wpdb->insert_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($slug) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = sanitize_title($slug, $term_id);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3230,6 +3217,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! term_exists( $slug ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $slug;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // As of 4.1, duplicate slugs are allowed as long as they're in different taxonomies.
+ if ( get_option( 'db_version' ) >= 30133 && ! get_term_by( 'slug', $slug, $term->taxonomy ) ) {
+ return $slug;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
</span><span class="cx" style="display: block; padding: 0 10px"> // by incorporating parent slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical($term->taxonomy) && !empty($term->parent) ) {
</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-11-05 01:08:44 UTC (rev 30239)
+++ trunk/tests/phpunit/tests/term.php 2014-11-05 01:41:58 UTC (rev 30240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,6 +226,93 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_wp_error( $term20 ) );
</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 5809
+ */
+ public function test_wp_insert_term_duplicate_slug_same_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $t = $this->factory->term->create( array(
+ 'name' => 'Foo',
+ 'slug' => 'foo',
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $term = get_term( $t, 'wptests_tax' );
+
+ $created = wp_insert_term( 'Foo 2', 'wptests_tax', array(
+ 'slug' => 'foo',
+ ) );
+
+ $created_term = get_term( $created['term_id'], 'wptests_tax' );
+ $this->assertSame( 'foo-2', $created_term->slug );
+
+ _unregister_taxonomy( 'wptests_tax', 'post' );
+ }
+
+ /**
+ * @ticket 5809
+ */
+ public function test_wp_insert_term_duplicate_slug_different_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ register_taxonomy( 'wptests_tax_2', 'post' );
+ $t = $this->factory->term->create( array(
+ 'name' => 'Foo',
+ 'slug' => 'foo',
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $term = get_term( $t, 'wptests_tax' );
+
+ $created = wp_insert_term( 'Foo 2', 'wptests_tax_2', array(
+ 'slug' => 'foo',
+ ) );
+
+ $this->assertFalse( is_wp_error( $created ) );
+
+ $new_term = get_term( $created['term_id'], 'wptests_tax_2' );
+
+ $this->assertSame( 'foo', $new_term->slug );
+
+ _unregister_taxonomy( 'wptests_tax', 'post' );
+ }
+
+ /**
+ * @ticket 5809
+ */
+ public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() {
+
+ $db_version = get_option( 'db_version' );
+ update_option( 'db_version', 30055 );
+
+ register_taxonomy( 'wptests_tax', 'post' );
+ register_taxonomy( 'wptests_tax_2', 'post' );
+ $t = $this->factory->term->create( array(
+ 'name' => 'Foo',
+ 'slug' => 'foo',
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $term = get_term( $t, 'wptests_tax' );
+
+ $created = wp_insert_term( 'Foo 2', 'wptests_tax_2', array(
+ 'slug' => 'foo',
+ ) );
+
+ $this->assertFalse( is_wp_error( $created ) );
+
+ $new_term = get_term( $created['term_id'], 'wptests_tax_2' );
+
+ /*
+ * As of 4.1, we no longer create a shared term, but we also do not
+ * allow for duplicate slugs.
+ */
+ $this->assertSame( 'foo-2', $new_term->slug );
+ $this->assertNotEquals( $new_term->term_id, $term->term_id );
+
+ _unregister_taxonomy( 'wptests_tax', 'post' );
+ update_option( 'db_version', $db_version );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_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">@@ -353,6 +440,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $existing_term, $found->get_error_data() );
</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 5809
+ */
+ public function test_wp_insert_term_should_not_create_shared_term() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ register_taxonomy( 'wptests_tax_2', 'post' );
+
+ $t1 = wp_insert_term( 'Foo', 'wptests_tax' );
+ $t2 = wp_insert_term( 'Foo', 'wptests_tax_2' );
+
+ $this->assertNotEquals( $t1['term_id'], $t2['term_id'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_return_term_id_and_term_taxonomy_id() {
</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"> $found = wp_insert_term( 'foo', 'wptests_tax' );
</span></span></pre>
</div>
</div>
</body>
</html>