Ticket #15008: 15008-2.diff

wp-admin/includes/taxonomy.php

@@ -80 +80 @@
 }
 
 /**
- * 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));
-}
-
-/**
  * Updates an existing Category or creates a new Category.
  *
  * @since 2.0.0

wp-admin/includes/deprecated.php

@@ -55 +55 @@
 }
 
 /**
+ * Deletes one existing category.
+ *
+ * @since 2.0.0
+ * @deprecated 3.1
+ * @deprecated use wp_delete_term()
+ *
+ * @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) {
+        _deprecated_function( __FUNCTION__, '3.1', 'wp_delete_term()' );
+        return wp_delete_term( $cat_ID );
+}
+
+/**
  * {@internal Missing Short Description}}
  *
  * @since unknown

wp-includes/taxonomy.php

@@ -1455 +1455 @@
         $tt_id = $ids['term_taxonomy_id'];
 
         $defaults = array();
+        
+        if ( 'category' == $taxonomy ) {
+                $defaults['default'] = get_option( 'default_category' );
+                if ( (int) $defaults['default'] == $term )
+                        return 0; // Don't delete the default category
+        }
+        
         $args = wp_parse_args($args, $defaults);
         extract($args, EXTR_SKIP);
 
-        if ( isset($default) ) {
+        if ( isset( $default ) ) {
                 $default = (int) $default;
                 if ( ! term_exists($default, $taxonomy) )
                         unset($default);