Changeset 28913

Timestamp:

06/29/2014 11:18:24 PM (11 years ago)

Author:

wonderboymusic

Message:

Allow comments in the trash to marked as spam.

Props mordauk.
Fixes #19256.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -210 +210 @@
         if ( in_array( $comment_status, array( 'all', 'moderated' ) ) )
             $actions['approve'] = __( 'Approve' );
-        if ( in_array( $comment_status, array( 'all', 'moderated', 'approved' ) ) )
+        if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
             $actions['spam'] = _x( 'Mark as Spam', 'comment' );
 
@@ -445 +445 @@
             }
 
-            if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
+            if ( 'spam' != $the_comment_status ) {
                 $actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
             } elseif ( 'spam' == $the_comment_status ) {
                 $actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
-            } elseif ( 'trash' == $the_comment_status ) {
+            }
+
+            if ( 'trash' == $the_comment_status ) {
                 $actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
             }