X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..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 5803b1dc..a5f96939 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -1,19 +1,19 @@
'comments',
@@ -47,10 +54,26 @@ class WP_Comments_List_Table extends WP_List_Table {
) );
}
+ 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;
@@ -112,22 +135,22 @@ class WP_Comments_List_Table extends WP_List_Table {
);
$_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,
@@ -135,6 +158,11 @@ class WP_Comments_List_Table extends WP_List_Table {
) );
}
+ /**
+ *
+ * @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' );
/**
@@ -145,19 +173,29 @@ class WP_Comments_List_Table extends WP_List_Table {
* @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;
@@ -166,22 +204,51 @@ class WP_Comments_List_Table extends WP_List_Table {
//, number_format_i18n($num_comments->moderated) ), ""),
//, 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;
@@ -193,9 +260,12 @@ class WP_Comments_List_Table extends WP_List_Table {
if ( !empty( $_REQUEST['s'] ) )
$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 )
+ )
) . '';
}
@@ -207,10 +277,15 @@ class WP_Comments_List_Table extends WP_List_Table {
* @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;
@@ -222,10 +297,11 @@ class WP_Comments_List_Table extends WP_List_Table {
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' );
@@ -235,14 +311,22 @@ class WP_Comments_List_Table extends WP_List_Table {
return $actions;
}
+ /**
+ *
+ * @global string $comment_status
+ * @global string $comment_type
+ *
+ * @param string $which
+ */
protected function extra_tablenav( $which ) {
global $comment_status, $comment_type;
?>
-
';
}
+ /**
+ * @return string|false
+ */
public function current_action() {
if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
return 'delete_all';
@@ -294,6 +381,12 @@ class WP_Comments_List_Table extends WP_List_Table {
return parent::current_action();
}
+ /**
+ *
+ * @global int $post_id
+ *
+ * @return array
+ */
public function get_columns() {
global $post_id;
@@ -305,121 +398,262 @@ 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;
}
+ /**
+ *
+ * @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
+ * @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(); ?>
-
-
- print_column_headers( false ); ?>
-
-
-
+
+
+
+ print_column_headers( false ); ?>
+
+
+
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 );
- $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_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 "\n";
+
+ unset( $GLOBALS['post'], $GLOBALS['comment'] );
}
- public function column_cb( $comment ) {
- if ( $this->user_can ) { ?>
-
-
- 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'] = "" . __( 'Unapprove' ) . '';
+ } elseif ( 'unapproved' === $the_comment_status ) {
+ $actions['approve'] = "" . __( 'Approve' ) . '';
+ }
+ } else {
+ $actions['approve'] = "" . __( 'Approve' ) . '';
+ $actions['unapprove'] = "" . __( 'Unapprove' ) . '';
+ }
+
+ 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' ) );
- $user_can = $this->user_can;
+ $actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+ }
- $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
- $the_comment_status = wp_get_comment_status( $comment->comment_ID );
+ /** 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';
+ }
- 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" ) );
+ $out .= "$sep$link";
+ }
+ $out .= '
';
- $url = "comment.php?c=$comment->comment_ID";
+ $out .= '';
- $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" );
+ return $out;
+ }
+
+ /**
+ *
+ * @param WP_Comment $comment The comment object.
+ */
+ public function column_cb( $comment ) {
+ if ( $this->user_can ) { ?>
+
+
+ ';
$this->column_author( $comment );
echo '';
- 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' ) ),
- 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
%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 ) { ?>