<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12401] trunk/wp-admin: Fix action on dashboard spam link,
merge deletecomment with trashcomment, untrashcomment, spamcomment,
and unspamcomment, props caesarsgrunt, fixes #11432</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12401">12401</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-15 09:45:29 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix action on dashboard spam link, merge deletecomment with trashcomment, untrashcomment, spamcomment, and unspamcomment, props caesarsgrunt, fixes <a href="http://trac.wordpress.org/ticket/11432">#11432</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (12400 => 12401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2009-12-15 04:55:47 UTC (rev 12400)
+++ trunk/wp-admin/comment.php 2009-12-15 09:45:29 UTC (rev 12401)
</span><span class="lines">@@ -137,35 +137,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'deletecomment' :
</span><del>- $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;
-
</del><span class="cx"> case 'trashcomment' :
</span><span class="cx"> case 'untrashcomment' :
</span><span class="cx"> case 'spamcomment' :
</span><span class="lines">@@ -190,6 +161,10 @@
</span><span class="cx"> $redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids'), $redir );
</span><span class="cx">
</span><span class="cx"> switch ( $action ) {
</span><ins>+ case 'deletecomment' :
+ wp_delete_comment($comment_id);
+ $redir = add_query_arg( array('deleted' => '1'), $redir );
+ break;
</ins><span class="cx"> case 'trashcomment' :
</span><span class="cx"> wp_trash_comment($comment_id);
</span><span class="cx"> $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12400 => 12401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2009-12-15 04:55:47 UTC (rev 12400)
+++ trunk/wp-admin/includes/dashboard.php 2009-12-15 09:45:29 UTC (rev 12401)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx">
</span><span class="cx"> $approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
</span><span class="cx"> $unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
</span><del>- $spam_url = esc_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
</del><ins>+ $spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
</ins><span class="cx"> $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
</span><span class="cx"> $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>