<!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>[12287] trunk/wp-admin/includes: Reorder comment actions, fixes #11258</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12287">12287</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-11-27 12:57:35 +0000 (Fri, 27 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reorder comment actions, fixes <a href="http://trac.wordpress.org/ticket/11258">#11258</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12286 => 12287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2009-11-27 10:34:09 UTC (rev 12286)
+++ trunk/wp-admin/includes/dashboard.php 2009-11-27 12:57:35 UTC (rev 12287)
</span><span class="lines">@@ -529,10 +529,17 @@
</span><span class="cx"> $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
</span><span class="cx"> $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
</span><span class="cx">
</span><del>- $actions = array();
-
</del><span class="cx"> $actions_string = '';
</span><span class="cx"> if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
</span><ins>+ // preorder it: Approve | Reply | Edit | Trash | Spam
+ $actions = array(
+ 'approve' => '', 'unapprove' => '',
+ 'reply' => '',
+ 'edit' => '',
+ 'trash' => '', 'delete' => '',
+ 'spam' => ''
+ );
+
</ins><span class="cx"> $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
</span><span class="cx"> $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
</span><span class="cx">
</span><span class="lines">@@ -552,7 +559,7 @@
</span><span class="cx"> else
</span><span class="cx"> $actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . __( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
</span><span class="cx">
</span><del>- $actions = apply_filters( 'comment_row_actions', $actions, $comment );
</del><ins>+ $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
</ins><span class="cx">
</span><span class="cx"> $i = 0;
</span><span class="cx"> foreach ( $actions as $action => $link ) {
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12286 => 12287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2009-11-27 10:34:09 UTC (rev 12286)
+++ trunk/wp-admin/includes/template.php 2009-11-27 12:57:35 UTC (rev 12287)
</span><span class="lines">@@ -2158,9 +2158,18 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>- $actions = array();
</del><span class="cx">
</span><span class="cx"> if ( $user_can ) {
</span><ins>+ // preorder it: Approve | Reply | Quick Edit | Edit | Trash | Spam
+ $actions = array(
+ 'approve' => '', 'unapprove' => '',
+ 'reply' => '',
+ 'quickedit' => '',
+ 'edit' => '',
+ 'trash' => '', 'untrash' => '', 'delete' => '',
+ 'spam' => '', 'unspam' => ''
+ );
+
</ins><span class="cx"> if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
</span><span class="cx"> if ( 'approved' == $the_comment_status )
</span><span class="cx"> $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span><span class="lines">@@ -2192,7 +2201,7 @@
</span><span class="cx"> $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $actions = apply_filters( 'comment_row_actions', $actions, $comment );
</del><ins>+ $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
</ins><span class="cx">
</span><span class="cx"> $i = 0;
</span><span class="cx"> echo '<div class="row-actions">';
</span></span></pre>
</div>
</div>
</body>
</html>