<!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>[15425] trunk: If category already exists, return its ID.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15425">15425</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-07-14 14:12:23 +0000 (Wed, 14 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>If category already exists, return its ID. Restores previous behavior. fixes <a href="http://trac.wordpress.org/ticket/14067">#14067</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15424 => 15425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-07-14 04:53:45 UTC (rev 15424)
+++ trunk/wp-includes/taxonomy.php 2010-07-14 14:12:23 UTC (rev 15425)
</span><span class="lines">@@ -1630,11 +1630,11 @@
</span><span class="cx"> if ( $term_id = term_exists($slug) ) {
</span><span class="cx"> $existing_term = $wpdb->get_row( $wpdb->prepare( "SELECT name FROM $wpdb->terms WHERE term_id = %d", $term_id), ARRAY_A );
</span><span class="cx"> // We've got an existing term in the same taxonomy, which matches the name of the new term:
</span><del>- if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && term_exists( (int) $term_id, $taxonomy ) ) {
</del><ins>+ if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && $exists = term_exists( (int) $term_id, $taxonomy ) ) {
</ins><span class="cx"> // Hierarchical, and it matches an existing term, Do not allow same "name" in the same level.
</span><span class="cx"> $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => (int)$parent) );
</span><span class="cx"> if ( in_array($name, $siblings) ) {
</span><del>- return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'));
</del><ins>+ return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'), $exists['term_id']);
</ins><span class="cx"> } else {
</span><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="lines">@@ -1647,9 +1647,9 @@
</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>- } elseif ( term_exists( (int) $term_id, $taxonomy ) ) {
</del><ins>+ } elseif ( $exists = term_exists( (int) $term_id, $taxonomy ) ) {
</ins><span class="cx"> // Same name, same slug.
</span><del>- return new WP_Error('term_exists', __('A term with the name provided already exists.'));
</del><ins>+ return new WP_Error('term_exists', __('A term with the name provided already exists.'), $exists['term_id']);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // This term does not exist at all in the database, Create it.
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (15424 => 15425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-07-14 04:53:45 UTC (rev 15424)
+++ trunk/xmlrpc.php 2010-07-14 14:12:23 UTC (rev 15425)
</span><span class="lines">@@ -933,9 +933,15 @@
</span><span class="cx"> "category_description" => $category["description"]
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $cat_id = wp_insert_category($new_category);
- if ( !$cat_id )
</del><ins>+ $cat_id = wp_insert_category($new_category, true);
+ if ( is_wp_error( $cat_id ) ) {
+ if ( 'term_exists' == $cat_id->get_error_code() )
+ return (int) $cat_id->get_error_data();
+ else
+ return(new IXR_Error(500, __("Sorry, the new category failed.")));
+ } elseif ( ! $cat_id ) {
</ins><span class="cx"> return(new IXR_Error(500, __("Sorry, the new category failed.")));
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return($cat_id);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>