<!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>[15690] trunk: Have wp_delete_category wrap wp_delete_term.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15690">15690</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-03 07:29:44 +0000 (Sun, 03 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have wp_delete_category wrap wp_delete_term. Move wp_delete_category into wp-includes scope for consistency. fixes <a href="http://trac.wordpress.org/ticket/15008">#15008</a>, props blepoxp.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestaxonomyphp">trunk/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class.wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/taxonomy.php (15689 => 15690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/taxonomy.php 2010-10-03 03:08:39 UTC (rev 15689)
+++ trunk/wp-admin/includes/taxonomy.php 2010-10-03 07:29:44 UTC (rev 15690)
</span><span class="lines">@@ -80,25 +80,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Deletes one existing category.
- *
- * @since 2.0.0
- *
- * @param int $cat_ID
- * @return mixed Returns true if completes delete action; false if term doesnt exist; Zero on attempted deletion of default Category; WP_Error object is also a possibility.
- */
-function wp_delete_category($cat_ID) {
- $cat_ID = (int) $cat_ID;
- $default = get_option('default_category');
-
- // Don't delete the default cat
- if ( $cat_ID == $default )
- return 0;
-
- return wp_delete_term($cat_ID, 'category', array('default' => $default));
-}
-
-/**
</del><span class="cx"> * Updates an existing Category or creates a new Category.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-xmlrpc-server.php (15689 => 15690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-xmlrpc-server.php 2010-10-03 03:08:39 UTC (rev 15689)
+++ trunk/wp-includes/class.wp-xmlrpc-server.php 2010-10-03 07:29:44 UTC (rev 15690)
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args Method parameters.
</span><del>- * @return mixed See {@link wp_delete_category()} for return info.
</del><ins>+ * @return mixed See {@link wp_delete_term()} for return info.
</ins><span class="cx"> */
</span><span class="cx"> function wp_deleteCategory($args) {
</span><span class="cx"> $this->escape($args);
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> if ( !current_user_can("manage_categories") )
</span><span class="cx"> return new IXR_Error( 401, __( "Sorry, you do not have the right to delete a category." ) );
</span><span class="cx">
</span><del>- return wp_delete_category( $category_id );
</del><ins>+ return wp_delete_term( $category_id, 'category' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15689 => 15690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-03 03:08:39 UTC (rev 15689)
+++ trunk/wp-includes/taxonomy.php 2010-10-03 07:29:44 UTC (rev 15690)
</span><span class="lines">@@ -1455,10 +1455,17 @@
</span><span class="cx"> $tt_id = $ids['term_taxonomy_id'];
</span><span class="cx">
</span><span class="cx"> $defaults = array();
</span><ins>+
+ if ( 'category' == $taxonomy ) {
+ $defaults['default'] = get_option( 'default_category' );
+ if ( $defaults['default'] == $term )
+ return 0; // Don't delete the default category
+ }
+
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> extract($args, EXTR_SKIP);
</span><span class="cx">
</span><del>- if ( isset($default) ) {
</del><ins>+ if ( isset( $default ) ) {
</ins><span class="cx"> $default = (int) $default;
</span><span class="cx"> if ( ! term_exists($default, $taxonomy) )
</span><span class="cx"> unset($default);
</span></span></pre>
</div>
</div>
</body>
</html>