Changeset 19296

Timestamp:

11/15/2011 02:02:42 PM (13 years ago)

Author:

ryan

Message:

Don't show edit links for spam comments. Props DH-Shredder. fixes #18340

Location:

trunk/wp-admin

Files:

• comment.php (modified) (1 diff)
• includes/class-wp-comments-list-table.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -70 +70 @@
         comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
 
+    if ( 'spam' == $comment->comment_approved )
+        comment_footer_die( __('This comment is marked as Spam. Please mark it as Not Spam if you want to edit it.') );
+
     $comment = get_comment_to_edit( $comment_id );
 

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

@@ -412 +412 @@
             }
 
-            if ( 'trash' != $the_comment_status ) {
+            if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
                 $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
                 $actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
-                if ( 'spam' != $the_comment_status )
-                    $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+                $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
             }