Changeset 10972

Timestamp:

04/17/2009 01:11:31 AM (16 years ago)

Author:

azaozz

Message:

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

Location:

trunk

Files:

• wp-admin/categories.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -41 +41 @@
         wp_die(__('Cheatin’ uh?'));
 
-    $cat_name = get_catname($cat_ID);
+    $cat_name = get_cat_name($cat_ID);
 
     // Don't delete the default cats.
@@ -61 +61 @@
 
     foreach ( (array) $_GET['delete'] as $cat_ID ) {
-        $cat_name = get_catname($cat_ID);
+        $cat_name = get_cat_name($cat_ID);
 
         // Don't delete the default cats.
@@ -235 +235 @@
 
 <div class="form-wrap">
-<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>
+<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>
 <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>
 </div>

trunk/wp-includes/functions.php

@@ -2245 +2245 @@
 
         $trans['add']['category']      = array( __( 'Your attempt to add this category has failed.' ), false );
-        $trans['delete']['category']   = array( __( 'Your attempt to delete this category: "%s" has failed.' ), 'get_catname' );
-        $trans['update']['category']   = array( __( 'Your attempt to edit this category: "%s" has failed.' ), 'get_catname' );
+        $trans['delete']['category']   = array( __( 'Your attempt to delete this category: "%s" has failed.' ), 'get_cat_name' );
+        $trans['update']['category']   = array( __( 'Your attempt to edit this category: "%s" has failed.' ), 'get_cat_name' );
 
         $trans['delete']['comment']    = array( __( 'Your attempt to delete this comment: "%s" has failed.' ), 'use_id' );