From 9b3f5be113bae5c2eb10358600d130fed7d0f86a Mon Sep 17 00:00:00 2001 From: azaozz Date: Tue, 1 Dec 2009 22:05:03 +0000 Subject: [PATCH] Swap Spam and Trash in comment action links, fixes #11258 git-svn-id: http://svn.automattic.com/wordpress/trunk@12311 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/dashboard.php | 6 +++--- wp-admin/includes/template.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 55b2227c6..f69fdd3a5 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -531,13 +531,13 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $actions_string = ''; if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - // preorder it: Approve | Reply | Edit | Trash | Spam + // preorder it: Approve | Reply | Edit | Spam | Trash $actions = array( 'approve' => '', 'unapprove' => '', 'reply' => '', 'edit' => '', - 'trash' => '', 'delete' => '', - 'spam' => '' + 'spam' => '', + 'trash' => '', 'delete' => '' ); $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index f5fa2d070..918dcd2d0 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -2160,14 +2160,14 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, } if ( $user_can ) { - // preorder it: Approve | Reply | Quick Edit | Edit | Trash | Spam + // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash $actions = array( 'approve' => '', 'unapprove' => '', 'reply' => '', 'quickedit' => '', 'edit' => '', - 'trash' => '', 'untrash' => '', 'delete' => '', - 'spam' => '', 'unspam' => '' + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' ); if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments