WordPress.org

Make WordPress Core

Changeset 15690


Ignore:
Timestamp:
10/03/10 07:29:44 (7 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/taxonomy.php

    r15688 r15690  
    8181 
    8282/** 
    83  * Deletes one existing category. 
    84  * 
    85  * @since 2.0.0 
    86  * 
    87  * @param int $cat_ID 
    88  * @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. 
    89  */ 
    90 function wp_delete_category($cat_ID) { 
    91     $cat_ID = (int) $cat_ID; 
    92     $default = get_option('default_category'); 
    93  
    94     // Don't delete the default cat 
    95     if ( $cat_ID == $default ) 
    96         return 0; 
    97  
    98     return wp_delete_term($cat_ID, 'category', array('default' => $default)); 
    99 } 
    100  
    101 /** 
    10283 * Updates an existing Category or creates a new Category. 
    10384 * 
  • trunk/wp-includes/class.wp-xmlrpc-server.php

    r15648 r15690  
    860860     * 
    861861     * @param array $args Method parameters. 
    862      * @return mixed See {@link wp_delete_category()} for return info. 
     862     * @return mixed See {@link wp_delete_term()} for return info. 
    863863     */ 
    864864    function wp_deleteCategory($args) { 
     
    878878            return new IXR_Error( 401, __( "Sorry, you do not have the right to delete a category." ) ); 
    879879 
    880         return wp_delete_category( $category_id ); 
     880        return wp_delete_term( $category_id, 'category' ); 
    881881    } 
    882882 
  • trunk/wp-includes/taxonomy.php

    r15688 r15690  
    14561456 
    14571457    $defaults = array(); 
     1458     
     1459    if ( 'category' == $taxonomy ) { 
     1460        $defaults['default'] = get_option( 'default_category' ); 
     1461        if ( $defaults['default'] == $term ) 
     1462            return 0; // Don't delete the default category 
     1463    } 
     1464     
    14581465    $args = wp_parse_args($args, $defaults); 
    14591466    extract($args, EXTR_SKIP); 
    14601467 
    1461     if ( isset($default) ) { 
     1468    if ( isset( $default ) ) { 
    14621469        $default = (int) $default; 
    14631470        if ( ! term_exists($default, $taxonomy) ) 
Note: See TracChangeset for help on using the changeset viewer.