Wordpress 3.3

[autoinstalls/wordpress.git] / 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 90c158fe6af50651914cc7beff93e14a16cd7e80..e3dc4c48b777157a4f402ca6ed9a2140dfccdc53 100644 (file)
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -21,7 +21,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 
        var $pending_count = array();
 
-       function WP_Comments_List_Table() {
+       function __construct() {
                global $post_id;
 
                $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
@@ -29,7 +29,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                if ( get_option('show_avatars') )
                        add_filter( 'comment_author', 'floated_admin_avatar' );
 
-               parent::WP_List_Table( array(
+               parent::__construct( array(
                        'plural' => 'comments',
                        'singular' => 'comment',
                        'ajax' => true,
@@ -110,6 +110,8 @@ class WP_Comments_List_Table extends WP_List_Table {
                        $_comment_post_ids[] = $_c->comment_post_ID;
                }
 
+               $_comment_post_ids = array_unique( $_comment_post_ids );
+
                $this->pending_count = get_pending_comments_num( $_comment_post_ids );
 
                $this->set_pagination_args( array(
@@ -300,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 "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
+               echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
                echo $this->single_row_columns( $comment );
-               echo "</tr>";
+               echo "</tr>\n";
        }
 
        function column_cb( $comment ) {
@@ -320,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 )
@@ -408,11 +411,10 @@ class WP_Comments_List_Table extends WP_List_Table {
                                $actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
                        }
 
-                       if ( 'trash' != $the_comment_status ) {
+                       if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
                                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
                                $actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
-                               if ( 'spam' != $the_comment_status )
-                                       $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+                               $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
                        }
 
                        $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
@@ -494,7 +496,8 @@ class WP_Comments_List_Table extends WP_List_Table {
                echo $post_link . '<br />';
                $this->comments_bubble( $post->ID, $pending_comments );
                echo '</span> ';
-               echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
+               $post_type_object = get_post_type_object( $post->post_type );
+               echo "<a href='" . get_permalink( $post->ID ) . "'>" . $post_type_object->labels->view_item . '</a>';
                echo '</div>';
                if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
                        echo $thumb;