Changeset 15690

Timestamp:

10/03/2010 07:29:44 AM (14 years ago)

Author:

nacin

Message:

Have wp_delete_category wrap wp_delete_term. Move wp_delete_category into wp-includes scope for consistency. fixes #15008, props blepoxp.

Location:

trunk

Files:

• wp-admin/includes/taxonomy.php (modified) (1 diff)
• wp-includes/class.wp-xmlrpc-server.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/includes/taxonomy.php

@@ -81 +81 @@
 
 /**
- * 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.
  *

trunk/wp-includes/class.wp-xmlrpc-server.php

@@ -860 +860 @@
      *
      * @param array $args Method parameters.
-     * @return mixed See {@link wp_delete_category()} for return info.
+     * @return mixed See {@link wp_delete_term()} for return info.
      */
     function wp_deleteCategory($args) {
@@ -878 +878 @@
             return new IXR_Error( 401, __( "Sorry, you do not have the right to delete a category." ) );
 
-        return wp_delete_category( $category_id );
+        return wp_delete_term( $category_id, 'category' );
     }
 

trunk/wp-includes/taxonomy.php

@@ -1456 +1456 @@
 
     $defaults = array();
+    
+    if ( 'category' == $taxonomy ) {
+        $defaults['default'] = get_option( 'default_category' );
+        if ( $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) )