WordPress.org

Make WordPress Core

Changeset 10972


Ignore:
Timestamp:
04/17/2009 01:11:31 AM (9 years ago)
Author:
azaozz
Message:

Don't use get_catname() (deprecated), props filosofo, see #9550

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/categories.php

    r10943 r10972  
    4141        wp_die(__('Cheatin’ uh?'));
    4242
    43     $cat_name = get_catname($cat_ID);
     43    $cat_name = get_cat_name($cat_ID);
    4444
    4545    // Don't delete the default cats.
     
    6161
    6262    foreach ( (array) $_GET['delete'] as $cat_ID ) {
    63         $cat_name = get_catname($cat_ID);
     63        $cat_name = get_cat_name($cat_ID);
    6464
    6565        // Don't delete the default cats.
     
    235235
    236236<div class="form-wrap">
    237 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
     237<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
    238238<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
    239239</div>
  • trunk/wp-includes/functions.php

    r10958 r10972  
    22452245
    22462246        $trans['add']['category']      = array( __( 'Your attempt to add this category has failed.' ), false );
    2247         $trans['delete']['category']   = array( __( 'Your attempt to delete this category: &quot;%s&quot; has failed.' ), 'get_catname' );
    2248         $trans['update']['category']   = array( __( 'Your attempt to edit this category: &quot;%s&quot; has failed.' ), 'get_catname' );
     2247        $trans['delete']['category']   = array( __( 'Your attempt to delete this category: &quot;%s&quot; has failed.' ), 'get_cat_name' );
     2248        $trans['update']['category']   = array( __( 'Your attempt to edit this category: &quot;%s&quot; has failed.' ), 'get_cat_name' );
    22492249
    22502250        $trans['delete']['comment']    = array( __( 'Your attempt to delete this comment: &quot;%s&quot; has failed.' ), 'use_id' );
Note: See TracChangeset for help on using the changeset viewer.