Ticket #4529: comment-trash-undo-fixes.diff

wp-admin/comment.php

@@ -176 +176 @@
         if (!current_user_can('edit_post', $comment->comment_post_ID ))
                 comment_footer_die( __('You are not allowed to edit comments on this post.') );
 
-        if ($action == 'trashcomment') {
-                check_admin_referer( 'trash-comment_' . $comment_id );
+        check_admin_referer( 'delete-comment_' . $comment_id );
+        
+        if ($action == 'trashcomment')
                 wp_trash_comment($comment_id);
-        }
-        else {
-                check_admin_referer( 'untrash-comment_' . $comment_id );
+        else
                 wp_untrash_comment($comment_id);
-        }
 
         if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ))
-                wp_redirect( wp_get_referer() );
+                $redir = wp_get_referer();
         else if ('' != wp_get_original_referer() && false == $noredir)
-                wp_redirect(wp_get_original_referer());
+                $redir = wp_get_original_referer();
         else
-                wp_redirect(admin_url('edit-comments.php'));
+                $redir = admin_url('edit-comments.php');
+                
+        wp_redirect(add_query_arg(array('trashed'=>'1', 'ids'=>$comment_id), $redir));
 
         die;
         break;
 
 case 'unapprovecomment' :
         $comment_id = absint( $_GET['c'] );
-        check_admin_referer( 'unapprove-comment_' . $comment_id );
+        check_admin_referer( 'approve-comment_' . $comment_id );
 
         if ( isset( $_GET['noredir'] ) )
                 $noredir = true;

wp-admin/edit-form-comment.php

@@ -68 +68 @@
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'trash-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?>
 </div>
 <div id="publishing-action">
 <input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />