X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..9c2096d803812dacbdf6cf8efe90053e39f00b96:/wp-admin/includes/class-wp-comments-list-table.php
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index fd25129b..e3dc4c48 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -302,18 +302,18 @@ class WP_Comments_List_Table extends WP_List_Table {
}
function single_row( $a_comment ) {
- global $post, $comment, $the_comment_status;
+ global $post, $comment;
$comment = $a_comment;
- $the_comment_status = wp_get_comment_status( $comment->comment_ID );
+ $the_comment_class = join( ' ', get_comment_class( wp_get_comment_status( $comment->comment_ID ) ) );
$post = get_post( $comment->comment_post_ID );
$this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
- echo "
";
+ echo "\n";
}
function column_cb( $comment ) {
@@ -322,11 +322,12 @@ class WP_Comments_List_Table extends WP_List_Table {
}
function column_comment( $comment ) {
- global $post, $comment_status, $the_comment_status;
+ global $post, $comment_status;
$user_can = $this->user_can;
$comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
+ $the_comment_status = wp_get_comment_status( $comment->comment_ID );
$ptime = date( 'G', strtotime( $comment->comment_date ) );
if ( ( abs( time() - $ptime ) ) < 86400 )
@@ -410,11 +411,10 @@ class WP_Comments_List_Table extends WP_List_Table {
$actions['trash'] = "';
}
- if ( 'trash' != $the_comment_status ) {
+ if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
$actions['edit'] = "". __( 'Edit' ) . '';
$actions['quickedit'] = '' . __( 'Quick Edit' ) . '';
- if ( 'spam' != $the_comment_status )
- $actions['reply'] = '' . __( 'Reply' ) . '';
+ $actions['reply'] = '' . __( 'Reply' ) . '';
}
$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
@@ -496,7 +496,8 @@ class WP_Comments_List_Table extends WP_List_Table {
echo $post_link . '
';
$this->comments_bubble( $post->ID, $pending_comments );
echo ' ';
- echo "#";
+ $post_type_object = get_post_type_object( $post->post_type );
+ echo "" . $post_type_object->labels->view_item . '';
echo '';
if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
echo $thumb;