WordPress 4.1.2
[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-comments-list-table.php
index 90c158fe6af50651914cc7beff93e14a16cd7e80..35a193f1ce8cb4253863823cf5492b4aab22cd41 100644 (file)
  */
 class WP_Comments_List_Table extends WP_List_Table {
 
  */
 class WP_Comments_List_Table extends WP_List_Table {
 
-       var $checkbox = true;
-
-       var $pending_count = array();
-
-       function WP_Comments_List_Table() {
+       public $checkbox = true;
+
+       public $pending_count = array();
+
+       /**
+        * Constructor.
+        *
+        * @since 3.1.0
+        * @access public
+        *
+        * @see WP_List_Table::__construct() for more information on default arguments.
+        *
+        * @param array $args An associative array of arguments.
+        */
+       public function __construct( $args = array() ) {
                global $post_id;
 
                $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
                global $post_id;
 
                $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
@@ -29,18 +39,19 @@ class WP_Comments_List_Table extends WP_List_Table {
                if ( get_option('show_avatars') )
                        add_filter( 'comment_author', 'floated_admin_avatar' );
 
                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,
                        'plural' => 'comments',
                        'singular' => 'comment',
                        'ajax' => true,
+                       'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
                ) );
        }
 
                ) );
        }
 
-       function ajax_user_can() {
+       public function ajax_user_can() {
                return current_user_can('edit_posts');
        }
 
                return current_user_can('edit_posts');
        }
 
-       function prepare_items() {
+       public function prepare_items() {
                global $post_id, $comment_status, $search, $comment_type;
 
                $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
                global $post_id, $comment_status, $search, $comment_type;
 
                $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
@@ -51,6 +62,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 
                $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
 
                $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
+               $post_type = ( isset( $_REQUEST['post_type'] ) ) ? sanitize_key( $_REQUEST['post_type'] ) : '';
+
                $user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
 
                $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
                $user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
 
                $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
@@ -81,7 +94,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 
                $status_map = array(
                        'moderated' => 'hold',
 
                $status_map = array(
                        'moderated' => 'hold',
-                       'approved' => 'approve'
+                       'approved' => 'approve',
+                       'all' => '',
                );
 
                $args = array(
                );
 
                $args = array(
@@ -94,6 +108,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                        'type' => $comment_type,
                        'orderby' => $orderby,
                        'order' => $order,
                        'type' => $comment_type,
                        'orderby' => $orderby,
                        'order' => $order,
+                       'post_type' => $post_type,
                );
 
                $_comments = get_comments( $args );
                );
 
                $_comments = get_comments( $args );
@@ -110,6 +125,8 @@ class WP_Comments_List_Table extends WP_List_Table {
                        $_comment_post_ids[] = $_c->comment_post_ID;
                }
 
                        $_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(
                $this->pending_count = get_pending_comments_num( $_comment_post_ids );
 
                $this->set_pagination_args( array(
@@ -118,23 +135,31 @@ class WP_Comments_List_Table extends WP_List_Table {
                ) );
        }
 
                ) );
        }
 
-       function get_per_page( $comment_status = 'all' ) {
+       public function get_per_page( $comment_status = 'all' ) {
                $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
                $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
+               /**
+                * Filter the number of comments listed per page in the comments list table.
+                *
+                * @since 2.6.0
+                *
+                * @param int    $comments_per_page The number of comments to list per page.
+                * @param string $comment_status    The comment status name. Default 'All'.
+                */
                $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
                return $comments_per_page;
        }
 
                $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
                return $comments_per_page;
        }
 
-       function no_items() {
+       public function no_items() {
                global $comment_status;
 
                if ( 'moderated' == $comment_status )
                global $comment_status;
 
                if ( 'moderated' == $comment_status )
-                       _e( 'No comments awaiting moderation… yet.' );
+                       _e( 'No comments awaiting moderation.' );
                else
                        _e( 'No comments found.' );
        }
 
                else
                        _e( 'No comments found.' );
        }
 
-       function get_views() {
-               global $post_id, $comment_status;
+       protected function get_views() {
+               global $post_id, $comment_status, $comment_type;
 
                $status_links = array();
                $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
 
                $status_links = array();
                $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
@@ -166,7 +191,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                        /*
                        // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
                        if ( !empty( $_REQUEST['s'] ) )
                        /*
                        // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
                        if ( !empty( $_REQUEST['s'] ) )
-                               $link = add_query_arg( 's', esc_attr( stripslashes( $_REQUEST['s'] ) ), $link );
+                               $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
                        */
                        $status_links[$status] = "<a href='$link'$class>" . sprintf(
                                translate_nooped_plural( $label, $num_comments->$status ),
                        */
                        $status_links[$status] = "<a href='$link'$class>" . sprintf(
                                translate_nooped_plural( $label, $num_comments->$status ),
@@ -174,19 +199,27 @@ class WP_Comments_List_Table extends WP_List_Table {
                        ) . '</a>';
                }
 
                        ) . '</a>';
                }
 
+               /**
+                * Filter the comment status links.
+                *
+                * @since 2.5.0
+                *
+                * @param array $status_links An array of fully-formed status links. Default 'All'.
+                *                            Accepts 'All', 'Pending', 'Approved', 'Spam', and 'Trash'.
+                */
                $status_links = apply_filters( 'comment_status_links', $status_links );
                return $status_links;
        }
 
                $status_links = apply_filters( 'comment_status_links', $status_links );
                return $status_links;
        }
 
-       function get_bulk_actions() {
+       protected function get_bulk_actions() {
                global $comment_status;
 
                $actions = array();
                if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
                        $actions['unapprove'] = __( 'Unapprove' );
                global $comment_status;
 
                $actions = array();
                if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
                        $actions['unapprove'] = __( 'Unapprove' );
-               if ( in_array( $comment_status, array( 'all', 'moderated', 'spam' ) ) )
+               if ( in_array( $comment_status, array( 'all', 'moderated' ) ) )
                        $actions['approve'] = __( 'Approve' );
                        $actions['approve'] = __( 'Approve' );
-               if ( in_array( $comment_status, array( 'all', 'moderated', 'approved' ) ) )
+               if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
                        $actions['spam'] = _x( 'Mark as Spam', 'comment' );
 
                if ( 'trash' == $comment_status )
                        $actions['spam'] = _x( 'Mark as Spam', 'comment' );
 
                if ( 'trash' == $comment_status )
@@ -202,46 +235,67 @@ class WP_Comments_List_Table extends WP_List_Table {
                return $actions;
        }
 
                return $actions;
        }
 
-       function extra_tablenav( $which ) {
+       protected function extra_tablenav( $which ) {
                global $comment_status, $comment_type;
 ?>
                <div class="alignleft actions">
 <?php
                if ( 'top' == $which ) {
 ?>
                global $comment_status, $comment_type;
 ?>
                <div class="alignleft actions">
 <?php
                if ( 'top' == $which ) {
 ?>
-                       <select name="comment_type">
-                               <option value=""><?php _e( 'Show all comment types' ); ?></option>
+                       <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
+                       <select id="filter-by-comment-type" name="comment_type">
+                               <option value=""><?php _e( 'All comment types' ); ?></option>
 <?php
 <?php
+                               /**
+                                * Filter the comment types dropdown menu.
+                                *
+                                * @since 2.7.0
+                                *
+                                * @param array $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
+                                */
                                $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
                                        'comment' => __( 'Comments' ),
                                        'pings' => __( 'Pings' ),
                                ) );
 
                                foreach ( $comment_types as $type => $label )
                                $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
                                        'comment' => __( 'Comments' ),
                                        'pings' => __( 'Pings' ),
                                ) );
 
                                foreach ( $comment_types as $type => $label )
-                                       echo "\t<option value='" . esc_attr( $type ) . "'" . selected( $comment_type, $type, false ) . ">$label</option>\n";
+                                       echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
                        ?>
                        </select>
 <?php
                        ?>
                        </select>
 <?php
-                       submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+                       /**
+                        * Fires just before the Filter submit button for comment types.
+                        *
+                        * @since 3.5.0
+                        */
+                       do_action( 'restrict_manage_comments' );
+                       submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
                }
 
                if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
                        wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
                        $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
                }
 
                if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
                        wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
                        $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
-                       submit_button( $title, 'button-secondary apply', 'delete_all', false );
+                       submit_button( $title, 'apply', 'delete_all', false );
                }
                }
+               /**
+                * Fires after the Filter submit button for comment types.
+                *
+                * @since 2.5.0
+                *
+                * @param string $comment_status The comment status name. Default 'All'.
+                */
                do_action( 'manage_comments_nav', $comment_status );
                echo '</div>';
        }
 
                do_action( 'manage_comments_nav', $comment_status );
                echo '</div>';
        }
 
-       function current_action() {
+       public function current_action() {
                if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
                        return 'delete_all';
 
                return parent::current_action();
        }
 
                if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
                        return 'delete_all';
 
                return parent::current_action();
        }
 
-       function get_columns() {
+       public function get_columns() {
                global $post_id;
 
                $columns = array();
                global $post_id;
 
                $columns = array();
@@ -258,22 +312,20 @@ class WP_Comments_List_Table extends WP_List_Table {
                return $columns;
        }
 
                return $columns;
        }
 
-       function get_sortable_columns() {
+       protected function get_sortable_columns() {
                return array(
                        'author'   => 'comment_author',
                        'response' => 'comment_post_ID'
                );
        }
 
                return array(
                        'author'   => 'comment_author',
                        'response' => 'comment_post_ID'
                );
        }
 
-       function display() {
-               extract( $this->_args );
-
+       public function display() {
                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 
                $this->display_tablenav( 'top' );
 
 ?>
                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 
                $this->display_tablenav( 'top' );
 
 ?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0">
+<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>">
        <thead>
        <tr>
                <?php $this->print_column_headers(); ?>
        <thead>
        <tr>
                <?php $this->print_column_headers(); ?>
@@ -286,11 +338,11 @@ class WP_Comments_List_Table extends WP_List_Table {
        </tr>
        </tfoot>
 
        </tr>
        </tfoot>
 
-       <tbody id="the-comment-list" class="list:comment">
+       <tbody id="the-comment-list" data-wp-lists="list:comment">
                <?php $this->display_rows_or_placeholder(); ?>
        </tbody>
 
                <?php $this->display_rows_or_placeholder(); ?>
        </tbody>
 
-       <tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
+       <tbody id="the-extra-comment-list" data-wp-lists="list:comment" style="display: none;">
                <?php $this->items = $this->extra_items; $this->display_rows(); ?>
        </tbody>
 </table>
                <?php $this->items = $this->extra_items; $this->display_rows(); ?>
        </tbody>
 </table>
@@ -299,38 +351,38 @@ class WP_Comments_List_Table extends WP_List_Table {
                $this->display_tablenav( 'bottom' );
        }
 
                $this->display_tablenav( 'bottom' );
        }
 
-       function single_row( $a_comment ) {
-               global $post, $comment, $the_comment_status;
+       public function single_row( $a_comment ) {
+               global $post, $comment;
 
                $comment = $a_comment;
 
                $comment = $a_comment;
-               $the_comment_status = wp_get_comment_status( $comment->comment_ID );
+               $the_comment_class = wp_get_comment_status( $comment->comment_ID );
+               $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) );
 
                $post = get_post( $comment->comment_post_ID );
 
                $this->user_can = current_user_can( 'edit_comment', $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 $this->single_row_columns( $comment );
-               echo "</tr>";
+               echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
+               $this->single_row_columns( $comment );
+               echo "</tr>\n";
        }
 
        }
 
-       function column_cb( $comment ) {
-               if ( $this->user_can )
-                       echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
+       public function column_cb( $comment ) {
+               if ( $this->user_can ) { ?>
+               <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
+               <input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
+               <?php
+               }
        }
 
        }
 
-       function column_comment( $comment ) {
-               global $post, $comment_status, $the_comment_status;
+       public function column_comment( $comment ) {
+               global $comment_status;
+               $post = get_post();
 
                $user_can = $this->user_can;
 
                $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
 
                $user_can = $this->user_can;
 
                $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
-
-               $ptime = date( 'G', strtotime( $comment->comment_date ) );
-               if ( ( abs( time() - $ptime ) ) < 86400 )
-                       $ptime = sprintf( __( '%s ago' ), human_time_diff( $ptime ) );
-               else
-                       $ptime = mysql2date( __( 'Y/m/d \a\t g:i A' ), $comment->comment_date );
+               $the_comment_status = wp_get_comment_status( $comment->comment_ID );
 
                if ( $user_can ) {
                        $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
 
                if ( $user_can ) {
                        $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
@@ -347,11 +399,17 @@ class WP_Comments_List_Table extends WP_List_Table {
                        $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
                }
 
                        $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
                }
 
+               echo '<div class="comment-author">';
+                       $this->column_author( $comment );
+               echo '</div>';
+
                echo '<div class="submitted-on">';
                /* translators: 2: comment date, 3: comment time */
                printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
                echo '<div class="submitted-on">';
                /* translators: 2: comment date, 3: comment time */
                printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
-                       /* translators: comment date format. See http://php.net/date */ get_comment_date( __( 'Y/m/d' ) ),
-                       /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
+                       /* translators: comment date format. See http://php.net/date */
+                       get_comment_date( __( 'Y/m/d' ) ),
+                       get_comment_date( get_option( 'time_format' ) )
+               );
 
                if ( $comment->comment_parent ) {
                        $parent = get_comment( $comment->comment_parent );
 
                if ( $comment->comment_parent ) {
                        $parent = get_comment( $comment->comment_parent );
@@ -364,7 +422,10 @@ class WP_Comments_List_Table extends WP_List_Table {
                comment_text();
                if ( $user_can ) { ?>
                <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
                comment_text();
                if ( $user_can ) { ?>
                <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-               <textarea class="comment" rows="1" cols="1"><?php echo esc_textarea( apply_filters( 'comment_edit_pre', $comment->comment_content ) ); ?></textarea>
+               <textarea class="comment" rows="1" cols="1"><?php
+                       /** This filter is documented in wp-admin/includes/comment.php */
+                       echo esc_textarea( apply_filters( 'comment_edit_pre', $comment->comment_content ) );
+               ?></textarea>
                <div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
                <div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
                <div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
                <div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
                <div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
                <div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
@@ -374,7 +435,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                }
 
                if ( $user_can ) {
                }
 
                if ( $user_can ) {
-                       // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
+                       // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
                        $actions = array(
                                'approve' => '', 'unapprove' => '',
                                'reply' => '',
                        $actions = array(
                                'approve' => '', 'unapprove' => '',
                                'reply' => '',
@@ -384,37 +445,44 @@ class WP_Comments_List_Table extends WP_List_Table {
                                'trash' => '', 'untrash' => '', 'delete' => ''
                        );
 
                                'trash' => '', 'untrash' => '', 'delete' => ''
                        );
 
-                       if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
+                       // Not looking at all comments.
+                       if ( $comment_status && 'all' != $comment_status ) {
                                if ( 'approved' == $the_comment_status )
                                if ( 'approved' == $the_comment_status )
-                                       $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='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+                                       $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
                                else if ( 'unapproved' == $the_comment_status )
                                else if ( 'unapproved' == $the_comment_status )
-                                       $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+                                       $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
                        } else {
                        } else {
-                               $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-                               $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+                               $actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+                               $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
                        }
 
                        }
 
-                       if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
-                               $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+                       if ( 'spam' != $the_comment_status ) {
+                               $actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
                        } elseif ( 'spam' == $the_comment_status ) {
                        } elseif ( 'spam' == $the_comment_status ) {
-                               $actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
-                       } elseif ( 'trash' == $the_comment_status ) {
-                               $actions['untrash'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1 vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
+                               $actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
+                       }
+
+                       if ( 'trash' == $the_comment_status ) {
+                               $actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
                        }
 
                        if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
                        }
 
                        if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
-                               $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::delete=1 delete vim-d vim-destructive'>" . __( 'Delete Permanently' ) . '</a>';
+                               $actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive'>" . __( 'Delete Permanently' ) . '</a>';
                        } else {
                        } else {
-                               $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>';
+                               $actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='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['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>';
+
+                               $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" title="%s" href="#">%s</a>';
+
+                               $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
+
+                               $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
                        }
 
                        }
 
+                       /** This filter is documented in wp-admin/includes/dashboard.php */
                        $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
 
                        $i = 0;
                        $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
 
                        $i = 0;
@@ -439,7 +507,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                }
        }
 
                }
        }
 
-       function column_author( $comment ) {
+       public function column_author( $comment ) {
                global $comment_status;
 
                $author_url = get_comment_author_url();
                global $comment_status;
 
                $author_url = get_comment_author_url();
@@ -447,7 +515,7 @@ class WP_Comments_List_Table extends WP_List_Table {
                        $author_url = '';
                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
                if ( strlen( $author_url_display ) > 50 )
                        $author_url = '';
                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
                if ( strlen( $author_url_display ) > 50 )
-                       $author_url_display = substr( $author_url_display, 0, 49 ) . '...';
+                       $author_url_display = substr( $author_url_display, 0, 49 ) . '&hellip;';
 
                echo "<strong>"; comment_author(); echo '</strong><br />';
                if ( !empty( $author_url ) )
 
                echo "<strong>"; comment_author(); echo '</strong><br />';
                if ( !empty( $author_url ) )
@@ -458,23 +526,24 @@ class WP_Comments_List_Table extends WP_List_Table {
                                comment_author_email_link();
                                echo '<br />';
                        }
                                comment_author_email_link();
                                echo '<br />';
                        }
-                       echo '<a href="edit-comments.php?s=';
-                       comment_author_IP();
-                       echo '&amp;mode=detail';
-                       if ( 'spam' == $comment_status )
-                               echo '&amp;comment_status=spam';
-                       echo '">';
-                       comment_author_IP();
-                       echo '</a>';
+
+                       $author_ip = get_comment_author_IP();
+                       if ( $author_ip ) {
+                               $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
+                               if ( 'spam' == $comment_status ) {
+                                       $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
+                               }
+                               printf( '<a href="%s">%s</a>', esc_url( $author_ip_url ), $author_ip );
+                       }
                }
        }
 
                }
        }
 
-       function column_date( $comment ) {
+       public function column_date() {
                return get_comment_date( __( 'Y/m/d \a\t g:ia' ) );
        }
 
                return get_comment_date( __( 'Y/m/d \a\t g:ia' ) );
        }
 
-       function column_response( $comment ) {
-               global $post;
+       public function column_response() {
+               $post = get_post();
 
                if ( isset( $this->pending_count[$post->ID] ) ) {
                        $pending_comments = $this->pending_count[$post->ID];
 
                if ( isset( $this->pending_count[$post->ID] ) ) {
                        $pending_comments = $this->pending_count[$post->ID];
@@ -485,22 +554,31 @@ class WP_Comments_List_Table extends WP_List_Table {
 
                if ( current_user_can( 'edit_post', $post->ID ) ) {
                        $post_link = "<a href='" . get_edit_post_link( $post->ID ) . "'>";
 
                if ( current_user_can( 'edit_post', $post->ID ) ) {
                        $post_link = "<a href='" . get_edit_post_link( $post->ID ) . "'>";
-                       $post_link .= get_the_title( $post->ID ) . '</a>';
+                       $post_link .= esc_html( get_the_title( $post->ID ) ) . '</a>';
                } else {
                } else {
-                       $post_link = get_the_title( $post->ID );
+                       $post_link = esc_html( get_the_title( $post->ID ) );
                }
 
                echo '<div class="response-links"><span class="post-com-count-wrapper">';
                echo $post_link . '<br />';
                $this->comments_bubble( $post->ID, $pending_comments );
                echo '</span> ';
                }
 
                echo '<div class="response-links"><span class="post-com-count-wrapper">';
                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;
        }
 
                echo '</div>';
                if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
                        echo $thumb;
        }
 
-       function column_default( $comment, $column_name ) {
+       public function column_default( $comment, $column_name ) {
+               /**
+                * Fires when the default column output is displayed for a single row.
+                *
+                * @since 2.8.0
+                *
+                * @param string $column_name         The custom column's name.
+                * @param int    $comment->comment_ID The custom column's unique ID number.
+                */
                do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
        }
 }
                do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
        }
 }
@@ -517,7 +595,7 @@ class WP_Comments_List_Table extends WP_List_Table {
  */
 class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 
  */
 class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 
-       function get_column_info() {
+       protected function get_column_info() {
                $this->_column_headers = array(
                        array(
                        'author'   => __( 'Author' ),
                $this->_column_headers = array(
                        array(
                        'author'   => __( 'Author' ),
@@ -530,28 +608,31 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
                return $this->_column_headers;
        }
 
                return $this->_column_headers;
        }
 
-       function get_table_classes() {
+       protected function get_table_classes() {
                $classes = parent::get_table_classes();
                $classes[] = 'comments-box';
                return $classes;
        }
 
                $classes = parent::get_table_classes();
                $classes[] = 'comments-box';
                return $classes;
        }
 
-       function display( $output_empty = false ) {
-               extract( $this->_args );
+       public function display( $output_empty = false ) {
+               $singular = $this->_args['singular'];
 
                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 
                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0" style="display:none;">
-       <tbody id="the-comment-list"<?php if ( $singular ) echo " class='list:$singular'"; ?>>
-               <?php if ( ! $output_empty ) $this->display_rows_or_placeholder(); ?>
+<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
+       <tbody id="the-comment-list"<?php
+               if ( $singular ) {
+                       echo " data-wp-lists='list:$singular'";
+               } ?>>
+               <?php if ( ! $output_empty ) {
+                       $this->display_rows_or_placeholder();
+               } ?>
        </tbody>
 </table>
 <?php
        }
 
        </tbody>
 </table>
 <?php
        }
 
-       function get_per_page( $comment_status = false ) {
+       public function get_per_page( $comment_status = false ) {
                return 10;
        }
 }
                return 10;
        }
 }
-
-?>