Changeset 12401

Timestamp:

12/15/2009 09:45:29 AM (15 years ago)

Author:

azaozz

Message:

Fix action on dashboard spam link, merge deletecomment with trashcomment, untrashcomment, spamcomment, and unspamcomment, props caesarsgrunt, fixes #11432

Location:

trunk/wp-admin

Files:

• comment.php (modified) (2 diffs)
• includes/dashboard.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -138 +138 @@
 
 case 'deletecomment' :
-    $comment_id = absint( $_REQUEST['c'] );
-    check_admin_referer( 'delete-comment_' . $comment_id );
-
-    if ( isset( $_REQUEST['noredir'] ) )
-        $noredir = true;
-    else
-        $noredir = false;
-
-    if ( !$comment = get_comment( $comment_id ) )
-        comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
-
-    if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-        comment_footer_die( __('You are not allowed to edit comments on this post.') );
-
-    if ( 'spam' == $_REQUEST['dt'] )
-        wp_set_comment_status( $comment->comment_ID, 'spam' );
-    else
-        wp_delete_comment( $comment->comment_ID );
-
-    if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
-        wp_redirect( wp_get_referer() );
-    else if ( '' != wp_get_original_referer() && false == $noredir )
-        wp_redirect( wp_get_original_referer() );
-    else
-        wp_redirect( admin_url('edit-comments.php') );
-
-    die;
-    break;
-
 case 'trashcomment' :
 case 'untrashcomment' :
@@ -191 +162 @@
 
     switch ( $action ) {
+        case 'deletecomment' :
+            wp_delete_comment($comment_id);
+            $redir = add_query_arg( array('deleted' => '1'), $redir );
+            break;
         case 'trashcomment' :
             wp_trash_comment($comment_id);

trunk/wp-admin/includes/dashboard.php

@@ -546 +546 @@
         $approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
         $unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-        $spam_url = esc_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+        $spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
         $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
         $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );