Ticket #9550: dont_use_get_catname.9550.diff

wp-includes/functions.php

@@ -2244 +2244 @@
                 $trans['update']['attachment'] = array( __( 'Your attempt to edit this attachment: "%s" has failed.' ), 'get_the_title' );
 
                 $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' );
                 $trans['unapprove']['comment'] = array( __( 'Your attempt to unapprove this comment: "%s" has failed.' ), 'use_id' );

wp-admin/categories.php

@@ -40 +40 @@
         if ( !current_user_can('manage_categories') )
                 wp_die(__('Cheatin’ uh?'));
 
-        $cat_name = get_catname($cat_ID);
+        $cat_name = get_cat_name($cat_ID);
 
         // Don't delete the default cats.
         if ( $cat_ID == get_option('default_category') )
@@ -60 +60 @@
                 wp_die( __('You are not allowed to delete categories.') );
 
         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.
                 if ( $cat_ID == get_option('default_category') )
@@ -234 +234 @@
 </form>
 
 <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>