X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..784f914b1e4b1c62d6657e86397c2e83bcee4295:/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 bb5a95e6..a5f96939 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -1,46 +1,80 @@ 'comments', 'singular' => 'comment', 'ajax' => true, + 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, ) ); } - function ajax_user_can() { + public function floated_admin_avatar( $name, $comment_ID ) { + $comment = get_comment( $comment_ID ); + $avatar = get_avatar( $comment, 32, 'mystery' ); + return "$avatar $name"; + } + + /** + * @return bool + */ + public function ajax_user_can() { return current_user_can('edit_posts'); } - function prepare_items() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $search + * @global string $comment_type + */ + public function prepare_items() { global $post_id, $comment_status, $search, $comment_type; $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all'; @@ -51,6 +85,8 @@ class WP_Comments_List_Table extends WP_List_Table { $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'] : ''; @@ -81,7 +117,8 @@ class WP_Comments_List_Table extends WP_List_Table { $status_map = array( 'moderated' => 'hold', - 'approved' => 'approve' + 'approved' => 'approve', + 'all' => '', ); $args = array( @@ -94,25 +131,26 @@ class WP_Comments_List_Table extends WP_List_Table { 'type' => $comment_type, 'orderby' => $orderby, 'order' => $order, + 'post_type' => $post_type, ); $_comments = get_comments( $args ); + if ( is_array( $_comments ) ) { + update_comment_cache( $_comments ); - update_comment_cache( $_comments ); - - $this->items = array_slice( $_comments, 0, $comments_per_page ); - $this->extra_items = array_slice( $_comments, $comments_per_page ); + $this->items = array_slice( $_comments, 0, $comments_per_page ); + $this->extra_items = array_slice( $_comments, $comments_per_page ); - $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); + $_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) ); - $_comment_post_ids = array(); - foreach ( $_comments as $_c ) { - $_comment_post_ids[] = $_c->comment_post_ID; + $this->pending_count = get_pending_comments_num( $_comment_post_ids ); } - $_comment_post_ids = array_unique( $_comment_post_ids ); - - $this->pending_count = get_pending_comments_num( $_comment_post_ids ); + $total_comments = get_comments( array_merge( $args, array( + 'count' => true, + 'offset' => 0, + 'number' => 0 + ) ) ); $this->set_pagination_args( array( 'total_items' => $total_comments, @@ -120,22 +158,45 @@ class WP_Comments_List_Table extends WP_List_Table { ) ); } - function get_per_page( $comment_status = 'all' ) { + /** + * + * @param string $comment_status + * @return int + */ + public function get_per_page( $comment_status = 'all' ) { $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' ); - $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); - return $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'. + */ + return apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); } - function no_items() { + /** + * + * @global string $comment_status + */ + public function no_items() { global $comment_status; - if ( 'moderated' == $comment_status ) + if ( 'moderated' === $comment_status ) { _e( 'No comments awaiting moderation.' ); - else + } else { _e( 'No comments found.' ); + } } - function get_views() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $comment_type + */ + protected function get_views() { global $post_id, $comment_status, $comment_type; $status_links = array(); @@ -143,22 +204,51 @@ class WP_Comments_List_Table extends WP_List_Table { //, number_format_i18n($num_comments->moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), //, number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") $stati = array( - 'all' => _nx_noop('All', 'All', 'comments'), // singular not used - 'moderated' => _n_noop('Pending (%s)', 'Pending (%s)'), - 'approved' => _n_noop('Approved', 'Approved'), // singular not used - 'spam' => _n_noop('Spam (%s)', 'Spam (%s)'), - 'trash' => _n_noop('Trash (%s)', 'Trash (%s)') - ); + /* translators: %s: all comments count */ + 'all' => _nx_noop( + 'All (%s)', + 'All (%s)', + 'comments' + ), // singular not used + + /* translators: %s: pending comments count */ + 'moderated' => _nx_noop( + 'Pending (%s)', + 'Pending (%s)', + 'comments' + ), + + /* translators: %s: approved comments count */ + 'approved' => _nx_noop( + 'Approved (%s)', + 'Approved (%s)', + 'comments' + ), + + /* translators: %s: spam comments count */ + 'spam' => _nx_noop( + 'Spam (%s)', + 'Spam (%s)', + 'comments' + ), + + /* translators: %s: trashed comments count */ + 'trash' => _nx_noop( + 'Trash (%s)', + 'Trash (%s)', + 'comments' + ) + ); if ( !EMPTY_TRASH_DAYS ) unset($stati['trash']); - $link = 'edit-comments.php'; + $link = admin_url( 'edit-comments.php' ); if ( !empty($comment_type) && 'all' != $comment_type ) $link = add_query_arg( 'comment_type', $comment_type, $link ); foreach ( $stati as $status => $label ) { - $class = ( $status == $comment_status ) ? ' class="current"' : ''; + $class = ( $status === $comment_status ) ? ' class="current"' : ''; if ( !isset( $num_comments->$status ) ) $num_comments->$status = 10; @@ -168,19 +258,35 @@ 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'] ) ) - $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] = "" . sprintf( + $status_links[ $status ] = "" . sprintf( translate_nooped_plural( $label, $num_comments->$status ), - number_format_i18n( $num_comments->$status ) + sprintf( '%s', + ( 'moderated' === $status ) ? 'pending' : $status, + number_format_i18n( $num_comments->$status ) + ) ) . ''; } - $status_links = apply_filters( 'comment_status_links', $status_links ); - return $status_links; + /** + * 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'. + */ + return apply_filters( 'comment_status_links', $status_links ); } - function get_bulk_actions() { + /** + * + * @global string $comment_status + * + * @return array + */ + protected function get_bulk_actions() { global $comment_status; $actions = array(); @@ -188,13 +294,14 @@ class WP_Comments_List_Table extends WP_List_Table { $actions['unapprove'] = __( 'Unapprove' ); if ( in_array( $comment_status, array( 'all', 'moderated' ) ) ) $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 ) + if ( 'trash' === $comment_status ) { $actions['untrash'] = __( 'Restore' ); - elseif ( 'spam' == $comment_status ) + } elseif ( 'spam' === $comment_status ) { $actions['unspam'] = _x( 'Not Spam', 'comment' ); + } if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS ) $actions['delete'] = __( 'Delete Permanently' ); @@ -204,46 +311,83 @@ class WP_Comments_List_Table extends WP_List_Table { return $actions; } - function extra_tablenav( $which ) { + /** + * + * @global string $comment_status + * @global string $comment_type + * + * @param string $which + */ + protected function extra_tablenav( $which ) { global $comment_status, $comment_type; ?>
- + __( 'Comments' ), 'pings' => __( 'Pings' ), ) ); foreach ( $comment_types as $type => $label ) - echo "\t\n"; + echo "\t" . '\n"; ?> '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' ) ) { + 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 ); + $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' ); + 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 '
'; } - function current_action() { + /** + * @return string|false + */ + public function current_action() { if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) return 'delete_all'; return parent::current_action(); } - function get_columns() { + /** + * + * @global int $post_id + * + * @return array + */ + public function get_columns() { global $post_id; $columns = array(); @@ -254,120 +398,267 @@ class WP_Comments_List_Table extends WP_List_Table { $columns['author'] = __( 'Author' ); $columns['comment'] = _x( 'Comment', 'column name' ); - if ( !$post_id ) - $columns['response'] = _x( 'In Response To', 'column name' ); + if ( ! $post_id ) { + /* translators: column name or table row header */ + $columns['response'] = __( 'In Response To' ); + } + + $columns['date'] = _x( 'Submitted On', 'column name' ); return $columns; } - function get_sortable_columns() { + /** + * + * @return array + */ + protected function get_sortable_columns() { return array( 'author' => 'comment_author', - 'response' => 'comment_post_ID' + 'response' => 'comment_post_ID', + 'date' => 'comment_date' ); } - function display() { - extract( $this->_args ); + /** + * Get the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'comment'. + */ + protected function get_default_primary_column_name() { + return 'comment'; + } + /** + * @access public + */ + public function display() { wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); $this->display_tablenav( 'top' ); + $this->screen->render_screen_reader_content( 'heading_list' ); + ?> - +
print_column_headers(); ?> + + display_rows_or_placeholder(); ?> + + + + items = $this->extra_items; + $this->display_rows_or_placeholder(); + ?> + + print_column_headers( false ); ?> - - display_rows_or_placeholder(); ?> - - - - items = $this->extra_items; $this->display_rows(); ?> -
display_tablenav( 'bottom' ); } - function single_row( $a_comment ) { + /** + * @global WP_Post $post + * @global WP_Comment $comment + * + * @param WP_Comment $item + */ + public function single_row( $item ) { global $post, $comment; - $comment = $a_comment; - $the_comment_class = join( ' ', get_comment_class( wp_get_comment_status( $comment->comment_ID ) ) ); + $comment = $item; - $post = get_post( $comment->comment_post_ID ); + $the_comment_class = wp_get_comment_status( $comment ); + if ( ! $the_comment_class ) { + $the_comment_class = ''; + } + $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) ); + if ( $comment->comment_post_ID > 0 ) { + $post = get_post( $comment->comment_post_ID ); + } $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); echo ""; - echo $this->single_row_columns( $comment ); + $this->single_row_columns( $comment ); echo "\n"; - } - function column_cb( $comment ) { - if ( $this->user_can ) - echo ""; + unset( $GLOBALS['post'], $GLOBALS['comment'] ); } - function column_comment( $comment ) { - global $post, $comment_status; + /** + * Generate and display row actions links. + * + * @since 4.3.0 + * @access protected + * + * @global string $comment_status Status for the current listed comments. + * + * @param WP_Comment $comment The comment object. + * @param string $column_name Current column name. + * @param string $primary Primary column name. + * @return string|void Comment row actions output. + */ + protected function handle_row_actions( $comment, $column_name, $primary ) { + global $comment_status; + + if ( $primary !== $column_name ) { + return ''; + } + + if ( ! $this->user_can ) { + return; + } - $user_can = $this->user_can; + $the_comment_status = wp_get_comment_status( $comment ); - $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); - $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + $out = ''; - $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 ); + $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); + $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); - if ( $user_can ) { - $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); - $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + $url = "comment.php?c=$comment->comment_ID"; - $url = "comment.php?c=$comment->comment_ID"; + $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); + $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); + $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); + $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); + $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); + $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); + $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + + // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash. + $actions = array( + 'approve' => '', 'unapprove' => '', + 'reply' => '', + 'quickedit' => '', + 'edit' => '', + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' + ); - $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); - $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); - $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); - $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); - $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); - $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); - $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + // Not looking at all comments. + if ( $comment_status && 'all' != $comment_status ) { + if ( 'approved' === $the_comment_status ) { + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } elseif ( 'unapproved' === $the_comment_status ) { + $actions['approve'] = "" . __( 'Approve' ) . ''; + } + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; } - echo '
'; - /* translators: 2: comment date, 3: comment time */ - printf( __( 'Submitted on %2$s at %3$s' ), $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' ) ) ); + if ( 'spam' !== $the_comment_status ) { + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + } elseif ( 'spam' === $the_comment_status ) { + $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; + } + + if ( 'trash' === $the_comment_status ) { + $actions['untrash'] = "" . __( 'Restore' ) . ''; + } + + if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) { + $actions['edit'] = "". __( 'Edit' ) . ''; + + $format = '%s'; + + $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick Edit' ) ); + + $actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_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; + $out .= '
'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') ) + $action .= ' hide-if-no-js'; + elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) { + if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) + $action .= ' approve'; + else + $action .= ' unapprove'; + } + + $out .= "$sep$link"; + } + $out .= '
'; + + $out .= ''; + + return $out; + } + + /** + * + * @param WP_Comment $comment The comment object. + */ + public function column_cb( $comment ) { + if ( $this->user_can ) { ?> + + + '; + $this->column_author( $comment ); + echo '
'; if ( $comment->comment_parent ) { $parent = get_comment( $comment->comment_parent ); - $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); - $name = get_comment_author( $parent->comment_ID ); - printf( ' | '.__( 'In reply to %2$s.' ), $parent_link, $name ); + if ( $parent ) { + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + __( 'In reply to %s.' ), + '' . $name . '' + ); + } } - echo ''; - comment_text(); - if ( $user_can ) { ?> + comment_text( $comment ); + if ( $this->user_can ) { ?> '', 'unapprove' => '', - 'reply' => '', - 'quickedit' => '', - 'edit' => '', - 'spam' => '', 'unspam' => '', - 'trash' => '', 'untrash' => '', 'delete' => '' - ); + /** + * + * @global string $comment_status + * + * @param WP_Comment $comment The comment object. + */ + public function column_author( $comment ) { + global $comment_status; - if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments - if ( 'approved' == $the_comment_status ) - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - else if ( 'unapproved' == $the_comment_status ) - $actions['approve'] = "" . __( 'Approve' ) . ''; - } else { - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - } + $author_url = get_comment_author_url( $comment ); - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - } elseif ( 'spam' == $the_comment_status ) { - $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; - } elseif ( 'trash' == $the_comment_status ) { - $actions['untrash'] = "" . __( 'Restore' ) . ''; - } + $author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) ); + if ( strlen( $author_url_display ) > 50 ) { + $author_url_display = wp_html_excerpt( $author_url_display, 49, '…' ); + } - if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; - } else { - $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; - } + echo ""; comment_author( $comment ); echo '
'; + if ( ! empty( $author_url_display ) ) { + printf( '%s
', esc_url( $author_url ), esc_html( $author_url_display ) ); + } - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['edit'] = "". __( 'Edit' ) . ''; - $actions['quickedit'] = '' . __( 'Quick Edit' ) . ''; - $actions['reply'] = '' . __( 'Reply' ) . ''; - } + if ( $this->user_can ) { + if ( ! empty( $comment->comment_author_email ) ) { + /* This filter is documented in wp-includes/comment-template.php */ + $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment ); - $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); - - $i = 0; - echo '
'; - foreach ( $actions as $action => $link ) { - ++$i; - ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; - - // Reply and quickedit need a hide-if-no-js span when not added with ajax - if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) - $action .= ' hide-if-no-js'; - elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { - if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) - $action .= ' approve'; - else - $action .= ' unapprove'; + if ( ! empty( $email ) && '@' !== $email ) { + printf( '%2$s
', esc_url( 'mailto:' . $email ), esc_html( $email ) ); } + } - echo "$sep$link"; + $author_ip = get_comment_author_IP( $comment ); + if ( $author_ip ) { + $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) ); + if ( 'spam' === $comment_status ) { + $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url ); + } + printf( '%2$s', esc_url( $author_ip_url ), esc_html( $author_ip ) ); } - echo '
'; } } - function column_author( $comment ) { - global $comment_status; - - $author_url = get_comment_author_url(); - if ( 'http://' == $author_url ) - $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 ) . '...'; - - echo ""; comment_author(); echo '
'; - if ( !empty( $author_url ) ) - echo "$author_url_display
"; + /** + * @access public + * + * @param WP_Comment $comment The comment object. + */ + public function column_date( $comment ) { + /* translators: 1: comment date, 2: comment time */ + $submitted = sprintf( __( '%1$s at %2$s' ), + /* translators: comment date format. See http://php.net/date */ + get_comment_date( __( 'Y/m/d' ), $comment ), + get_comment_date( __( 'g:i a' ), $comment ) + ); - if ( $this->user_can ) { - if ( !empty( $comment->comment_author_email ) ) { - comment_author_email_link(); - echo '
'; - } - echo ''; - comment_author_IP(); - echo ''; + echo '
'; + if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) { + printf( + '%s', + esc_url( get_comment_link( $comment ) ), + $submitted + ); + } else { + echo $submitted; } + echo '
'; } - function column_date( $comment ) { - return get_comment_date( __( 'Y/m/d \a\t g:ia' ) ); - } + /** + * @access public + * + * @param WP_Comment $comment The comment object. + */ + public function column_response( $comment ) { + $post = get_post(); - function column_response( $comment ) { - global $post; + if ( ! $post ) { + return; + } if ( isset( $this->pending_count[$post->ID] ) ) { $pending_comments = $this->pending_count[$post->ID]; @@ -486,73 +756,39 @@ class WP_Comments_List_Table extends WP_List_Table { } if ( current_user_can( 'edit_post', $post->ID ) ) { - $post_link = ""; - $post_link .= get_the_title( $post->ID ) . ''; + $post_link = ""; + $post_link .= esc_html( get_the_title( $post->ID ) ) . ''; } else { - $post_link = get_the_title( $post->ID ); + $post_link = esc_html( get_the_title( $post->ID ) ); } - echo '