<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14229] trunk: Allow Terms to exist within multiple taxonomies (
Regression in 3.0); If a term slug is provided on the form, Respect it (
do not suffix it, instead, feedback with error);
Do not allow hierarchical term names to exist multiple times within a set level
(ie.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14229">14229</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-25 07:35:16 +0000 (Sun, 25 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow Terms to exist within multiple taxonomies (Regression in 3.0); If a term slug is provided on the form, Respect it (do not suffix it, instead, feedback with error); Do not allow hierarchical term names to exist multiple times within a set level (ie. AU/NSW + AU/NSW is bad, AU/NSW + AU/VIC + AU/VIC/NSW is ok). See <a href="http://trac.wordpress.org/ticket/13060">#13060</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (14228 => 14229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-04-25 05:39:39 UTC (rev 14228)
+++ trunk/wp-admin/admin-ajax.php 2010-04-25 07:35:16 UTC (rev 14229)
</span><span class="lines">@@ -572,9 +572,8 @@
</span><span class="cx"> $tag_full_name = $_tag->name . ' &#8212; ' . $tag_full_name;
</span><span class="cx"> $level++;
</span><span class="cx"> }
</span><del>- }
- if ( is_taxonomy_hierarchical($taxonomy) )
</del><span class="cx"> $noparents = _tag_row( $tag, $level, $taxonomy );
</span><ins>+ }
</ins><span class="cx"> $tag->name = $tag_full_name;
</span><span class="cx"> $parents = _tag_row( $tag, 0, $taxonomy);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14228 => 14229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-04-25 05:39:39 UTC (rev 14228)
+++ trunk/wp-includes/taxonomy.php 2010-04-25 07:35:16 UTC (rev 14229)
</span><span class="lines">@@ -1523,8 +1523,8 @@
</span><span class="cx">
</span><span class="cx"> if ( empty($slug) )
</span><span class="cx"> $slug = sanitize_title($name);
</span><del>- elseif ( is_term($slug, $taxonomy) ) // Provided slug issue.
- return new WP_Error('term_slug_exists', __('A Term with the slug provided already exists.'));
</del><ins>+ elseif ( is_term($slug) )
+ return new WP_Error('term_slug_exists', __('A term with the slug provided already exists.'));
</ins><span class="cx">
</span><span class="cx"> $term_group = 0;
</span><span class="cx"> if ( $alias_of ) {
</span><span class="lines">@@ -1541,22 +1541,37 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $term_id = is_term($slug, $taxonomy) ) {
- // Make sure the slug is unique accross all taxonomies.
</del><ins>+ if ( $term_id = is_term($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, which matches the name of the new term:
+ if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name ) {
+ // Heirarchical, 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' => (int)$parent) );
+ if ( in_array($name, $siblings) ) {
+ return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'));
+ } else {
+ $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 ( $existing_term['name'] != $name ) {
+ // We've got an existing term, with a different name, Creat ethe 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;
+ }
+ } else {
+ // This term does not exist at all in the database, Create it.
</ins><span class="cx"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><span class="cx"> if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
</span><span class="cx"> return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
</span><span class="cx"> $term_id = (int) $wpdb->insert_id;
</span><del>- } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
- // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
- // by incorporating parent slugs.
- $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"> }
</span><span class="cx">
</span><del>- if ( empty($slug) ) {
</del><ins>+ // Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
+ if ( empty($slug) ) {
</ins><span class="cx"> $slug = sanitize_title($slug, $term_id);
</span><span class="cx"> do_action( 'edit_terms', $term_id );
</span><span class="cx"> $wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
</span></span></pre>
</div>
</div>
</body>
</html>