--- a/wp/wp-admin/includes/class-wp-comments-list-table.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-comments-list-table.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,19 +1,19 @@
<?php
/**
- * Comments and Post Comments List Table classes.
+ * List Table API: WP_Comments_List_Table class
*
* @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
* @since 3.1.0
*/
/**
- * Comments List Table class.
+ * Core class used to implement displaying comments in a list table.
*
- * @package WordPress
- * @subpackage List_Table
* @since 3.1.0
* @access private
+ *
+ * @see WP_List_Table
*/
class WP_Comments_List_Table extends WP_List_Table {
@@ -29,10 +29,11 @@
* Constructor.
*
* @since 3.1.0
- * @access public
*
* @see WP_List_Table::__construct() for more information on default arguments.
*
+ * @global int $post_id
+ *
* @param array $args An associative array of arguments.
*/
public function __construct( $args = array() ) {
@@ -40,8 +41,9 @@
$post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
- if ( get_option('show_avatars') )
- add_filter( 'comment_author', 'floated_admin_avatar' );
+ if ( get_option( 'show_avatars' ) ) {
+ add_filter( 'comment_author', array( $this, 'floated_admin_avatar' ), 10, 2 );
+ }
parent::__construct( array(
'plural' => 'comments',
@@ -51,10 +53,26 @@
) );
}
+ 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');
}
+ /**
+ *
+ * @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;
@@ -75,7 +93,7 @@
$comments_per_page = $this->get_per_page( $comment_status );
- $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+ $doing_ajax = wp_doing_ajax();
if ( isset( $_REQUEST['number'] ) ) {
$number = (int) $_REQUEST['number'];
@@ -116,22 +134,22 @@
);
$_comments = get_comments( $args );
-
- update_comment_cache( $_comments );
-
- $this->items = array_slice( $_comments, 0, $comments_per_page );
- $this->extra_items = array_slice( $_comments, $comments_per_page );
+ if ( is_array( $_comments ) ) {
+ update_comment_cache( $_comments );
- $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+ $this->items = array_slice( $_comments, 0, $comments_per_page );
+ $this->extra_items = array_slice( $_comments, $comments_per_page );
- $_comment_post_ids = array();
- foreach ( $_comments as $_c ) {
- $_comment_post_ids[] = $_c->comment_post_ID;
+ $_comment_post_ids = array_unique( wp_list_pluck( $_comments, '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,
@@ -139,53 +157,100 @@
) );
}
+ /**
+ *
+ * @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' );
/**
- * Filter the number of comments listed per page in the comments list table.
+ * Filters 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;
+ return apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
}
+ /**
+ *
+ * @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.' );
+ }
}
+ /**
+ *
+ * @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();
$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
- //, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
- //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
+
$stati = array(
- 'all' => _nx_noop('All', 'All', 'comments'), // singular not used
- 'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
- 'approved' => _n_noop('Approved', 'Approved'), // singular not used
- 'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
- 'trash' => _n_noop('Trash <span class="count">(<span class="trash-count">%s</span>)</span>', 'Trash <span class="count">(<span class="trash-count">%s</span>)</span>')
- );
+ /* translators: %s: all comments count */
+ 'all' => _nx_noop(
+ 'All <span class="count">(%s)</span>',
+ 'All <span class="count">(%s)</span>',
+ 'comments'
+ ), // singular not used
+
+ /* translators: %s: pending comments count */
+ 'moderated' => _nx_noop(
+ 'Pending <span class="count">(%s)</span>',
+ 'Pending <span class="count">(%s)</span>',
+ 'comments'
+ ),
+
+ /* translators: %s: approved comments count */
+ 'approved' => _nx_noop(
+ 'Approved <span class="count">(%s)</span>',
+ 'Approved <span class="count">(%s)</span>',
+ 'comments'
+ ),
+
+ /* translators: %s: spam comments count */
+ 'spam' => _nx_noop(
+ 'Spam <span class="count">(%s)</span>',
+ 'Spam <span class="count">(%s)</span>',
+ 'comments'
+ ),
+
+ /* translators: %s: trashed comments count */
+ 'trash' => _nx_noop(
+ 'Trash <span class="count">(%s)</span>',
+ 'Trash <span class="count">(%s)</span>',
+ '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"' : '';
+ $current_link_attributes = '';
+
+ if ( $status === $comment_status ) {
+ $current_link_attributes = ' class="current" aria-current="page"';
+ }
if ( !isset( $num_comments->$status ) )
$num_comments->$status = 10;
@@ -197,24 +262,32 @@
if ( !empty( $_REQUEST['s'] ) )
$link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
*/
- $status_links[$status] = "<a href='$link'$class>" . sprintf(
+ $status_links[ $status ] = "<a href='$link'$current_link_attributes>" . sprintf(
translate_nooped_plural( $label, $num_comments->$status ),
- number_format_i18n( $num_comments->$status )
+ sprintf( '<span class="%s-count">%s</span>',
+ ( 'moderated' === $status ) ? 'pending' : $status,
+ number_format_i18n( $num_comments->$status )
+ )
) . '</a>';
}
/**
- * Filter the comment status links.
+ * Filters 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;
+ return apply_filters( 'comment_status_links', $status_links );
}
+ /**
+ *
+ * @global string $comment_status
+ *
+ * @return array
+ */
protected function get_bulk_actions() {
global $comment_status;
@@ -226,10 +299,11 @@
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' );
@@ -239,19 +313,31 @@
return $actions;
}
+ /**
+ *
+ * @global string $comment_status
+ * @global string $comment_type
+ *
+ * @param string $which
+ */
protected function extra_tablenav( $which ) {
global $comment_status, $comment_type;
+ static $has_items;
+
+ if ( ! isset( $has_items ) ) {
+ $has_items = $this->has_items();
+ }
?>
<div class="alignleft actions">
<?php
- if ( 'top' == $which ) {
+ if ( 'top' === $which ) {
?>
<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
/**
- * Filter the comment types dropdown menu.
+ * Filters the comment types dropdown menu.
*
* @since 2.7.0
*
@@ -273,12 +359,12 @@
* @since 3.5.0
*/
do_action( 'restrict_manage_comments' );
- submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ submit_button( __( 'Filter' ), '', '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' ) && $has_items ) {
wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
- $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+ $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
submit_button( $title, 'apply', 'delete_all', false );
}
/**
@@ -292,6 +378,9 @@
echo '</div>';
}
+ /**
+ * @return string|false
+ */
public function current_action() {
if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
return 'delete_all';
@@ -299,6 +388,12 @@
return parent::current_action();
}
+ /**
+ *
+ * @global int $post_id
+ *
+ * @return array
+ */
public function get_columns() {
global $post_id;
@@ -310,26 +405,50 @@
$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;
}
+ /**
+ *
+ * @return array
+ */
protected function get_sortable_columns() {
return array(
'author' => 'comment_author',
- 'response' => 'comment_post_ID'
+ 'response' => 'comment_post_ID',
+ 'date' => 'comment_date'
);
}
+ /**
+ * Get the name of the default primary column.
+ *
+ * @since 4.3.0
+ *
+ * @return string Name of the default primary column, in this case, 'comment'.
+ */
+ protected function get_default_primary_column_name() {
+ return 'comment';
+ }
+
+ /**
+ */
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' );
+
?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
<thead>
<tr>
<?php $this->print_column_headers(); ?>
@@ -341,7 +460,10 @@
</tbody>
<tbody id="the-extra-comment-list" data-wp-lists="list:comment" style="display: none;">
- <?php $this->items = $this->extra_items; $this->display_rows(); ?>
+ <?php
+ $this->items = $this->extra_items;
+ $this->display_rows_or_placeholder();
+ ?>
</tbody>
<tfoot>
@@ -356,25 +478,155 @@
$this->display_tablenav( 'bottom' );
}
- public 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 = wp_get_comment_status( $comment->comment_ID );
+ $comment = $item;
+
+ $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_ID, $comment->comment_post_ID ) );
+ $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
- $post = get_post( $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 "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
$this->single_row_columns( $comment );
echo "</tr>\n";
+
+ unset( $GLOBALS['post'], $GLOBALS['comment'] );
}
+ /**
+ * Generate and display row actions links.
+ *
+ * @since 4.3.0
+ *
+ * @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;
+ }
+
+ $the_comment_status = wp_get_comment_status( $comment );
+
+ $out = '';
+
+ $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";
+
+ $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' => ''
+ );
+
+ // Not looking at all comments.
+ if ( $comment_status && 'all' != $comment_status ) {
+ if ( 'approved' === $the_comment_status ) {
+ $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+ } elseif ( 'unapproved' === $the_comment_status ) {
+ $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' class='vim-a vim-destructive' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+ }
+ } else {
+ $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' aria-label='" . 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' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</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' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+ } elseif ( 'spam' === $the_comment_status ) {
+ $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' aria-label='" . esc_attr__( 'Restore this comment from the spam' ) . "'>" . _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' aria-label='" . esc_attr__( 'Restore this comment from the Trash' ) . "'>" . __( 'Restore' ) . '</a>';
+ }
+
+ if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
+ $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' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+ } else {
+ $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' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+ }
+
+ if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
+ $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
+
+ $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
+
+ $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 .= '<div class="row-actions">';
+ 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 ) && ! wp_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 .= "<span class='$action'>$sep$link</span>";
+ }
+ $out .= '</div>';
+
+ $out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+
+ return $out;
+ }
+
+ /**
+ *
+ * @param WP_Comment $comment The comment object.
+ */
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>
@@ -383,49 +635,28 @@
}
}
+ /**
+ * @param WP_Comment $comment The comment object.
+ */
public function column_comment( $comment ) {
- global $comment_status;
- $post = get_post();
-
- $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
- $the_comment_status = wp_get_comment_status( $comment->comment_ID );
-
- if ( $this->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";
-
- $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" );
- }
-
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,
- /* 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 );
- $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
- $name = get_comment_author( $parent->comment_ID );
- printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $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.' ),
+ '<a href="' . $parent_link . '">' . $name . '</a>'
+ );
+ }
}
- echo '</div>';
- comment_text();
+ comment_text( $comment );
if ( $this->user_can ) { ?>
<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
<textarea class="comment" rows="1" cols="1"><?php
@@ -439,119 +670,86 @@
</div>
<?php
}
-
- if ( $this->user_can ) {
- // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
- $actions = array(
- 'approve' => '', 'unapprove' => '',
- 'reply' => '',
- 'quickedit' => '',
- 'edit' => '',
- 'spam' => '', 'unspam' => '',
- 'trash' => '', 'untrash' => '', 'delete' => ''
- );
-
- // Not looking at all comments.
- if ( $comment_status && 'all' != $comment_status ) {
- if ( 'approved' == $the_comment_status ) {
- $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
- } elseif ( 'unapproved' == $the_comment_status ) {
- $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
- }
- } else {
- $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 ) {
- $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 ) {
- $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 ) {
- $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 {
- $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 ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
- $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</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__( 'Edit this item inline' ), __( '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;
- echo '<div class="row-actions">';
- 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';
- }
-
- echo "<span class='$action'>$sep$link</span>";
- }
- echo '</div>';
- }
}
+ /**
+ *
+ * @global string $comment_status
+ *
+ * @param WP_Comment $comment The comment object.
+ */
public 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 ) . '…';
+ $author_url = get_comment_author_url( $comment );
- echo "<strong>"; comment_author(); echo '</strong><br />';
- if ( !empty( $author_url ) )
- echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
+ $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, '…' );
+ }
+
+ echo "<strong>"; comment_author( $comment ); echo '</strong><br />';
+ if ( ! empty( $author_url_display ) ) {
+ printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
+ }
if ( $this->user_can ) {
- if ( !empty( $comment->comment_author_email ) ) {
- comment_author_email_link();
- echo '<br />';
+ 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 );
+
+ if ( ! empty( $email ) && '@' !== $email ) {
+ printf( '<a href="%1$s">%2$s</a><br />', esc_url( 'mailto:' . $email ), esc_html( $email ) );
+ }
}
- $author_ip = get_comment_author_IP();
+ $author_ip = get_comment_author_IP( $comment );
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( 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( '<a href="%s">%s</a>', esc_url( $author_ip_url ), $author_ip );
+ printf( '<a href="%1$s">%2$s</a>', esc_url( $author_ip_url ), esc_html( $author_ip ) );
}
}
}
- public function column_date() {
- return get_comment_date( __( 'Y/m/d \a\t g:i a' ) );
+ /**
+ *
+ * @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 https://secure.php.net/date */
+ get_comment_date( __( 'Y/m/d' ), $comment ),
+ get_comment_date( __( 'g:i a' ), $comment )
+ );
+
+ echo '<div class="submitted-on">';
+ if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+ printf(
+ '<a href="%s">%s</a>',
+ esc_url( get_comment_link( $comment ) ),
+ $submitted
+ );
+ } else {
+ echo $submitted;
+ }
+ echo '</div>';
}
- public function column_response() {
+ /**
+ *
+ * @param WP_Comment $comment The comment object.
+ */
+ public function column_response( $comment ) {
$post = get_post();
+ if ( ! $post ) {
+ return;
+ }
+
if ( isset( $this->pending_count[$post->ID] ) ) {
$pending_comments = $this->pending_count[$post->ID];
} else {
@@ -560,23 +758,30 @@
}
if ( current_user_can( 'edit_post', $post->ID ) ) {
- $post_link = "<a href='" . get_edit_post_link( $post->ID ) . "'>";
+ $post_link = "<a href='" . get_edit_post_link( $post->ID ) . "' class='comments-edit-item-link'>";
$post_link .= esc_html( get_the_title( $post->ID ) ) . '</a>';
} else {
$post_link = esc_html( get_the_title( $post->ID ) );
}
- echo '<div class="response-links"><span class="post-com-count-wrapper">';
- echo $post_link . '<br />';
+ echo '<div class="response-links">';
+ if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
+ echo $thumb;
+ }
+ echo $post_link;
+ $post_type_object = get_post_type_object( $post->post_type );
+ echo "<a href='" . get_permalink( $post->ID ) . "' class='comments-view-item-link'>" . $post_type_object->labels->view_item . '</a>';
+ echo '<span class="post-com-count-wrapper post-com-count-', $post->ID, '">';
$this->comments_bubble( $post->ID, $pending_comments );
echo '</span> ';
- $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;
}
+ /**
+ *
+ * @param WP_Comment $comment The comment object.
+ * @param string $column_name The custom column's name.
+ */
public function column_default( $comment, $column_name ) {
/**
* Fires when the default column output is displayed for a single row.
@@ -589,55 +794,3 @@
do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
}
}
-
-/**
- * Post Comments List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- *
- * @see WP_Comments_Table
- */
-class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
-
- protected function get_column_info() {
- return array(
- array(
- 'author' => __( 'Author' ),
- 'comment' => _x( 'Comment', 'column name' ),
- ),
- array(),
- array(),
- );
- }
-
- protected function get_table_classes() {
- $classes = parent::get_table_classes();
- $classes[] = 'comments-box';
- return $classes;
- }
-
- public function display( $output_empty = false ) {
- $singular = $this->_args['singular'];
-
- wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
-<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
- }
-
- public function get_per_page( $comment_status = false ) {
- return 10;
- }
-}