X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..refs/tags/wordpress-4.3:/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 c489efee..fcfcd1e3 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -17,11 +17,27 @@
*/
class WP_Comments_List_Table extends WP_List_Table {
- var $checkbox = true;
-
- var $pending_count = array();
-
- function __construct( $args = array() ) {
+ public $checkbox = true;
+
+ public $pending_count = array();
+
+ public $extra_items;
+
+ private $user_can;
+
+ /**
+ * 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() ) {
global $post_id;
$post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
@@ -37,11 +53,21 @@ class WP_Comments_List_Table extends WP_List_Table {
) );
}
- function ajax_user_can() {
+ /**
+ * @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';
@@ -102,22 +128,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,
@@ -125,7 +151,12 @@ 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' );
/**
* Filter the number of comments listed per page in the comments list table.
@@ -135,11 +166,14 @@ 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 );
}
- function no_items() {
+ /**
+ *
+ * @global string $comment_status
+ */
+ public function no_items() {
global $comment_status;
if ( 'moderated' == $comment_status )
@@ -148,7 +182,13 @@ class WP_Comments_List_Table extends WP_List_Table {
_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();
@@ -197,11 +237,16 @@ 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 );
}
- function get_bulk_actions() {
+ /**
+ *
+ * @global string $comment_status
+ *
+ * @return array
+ */
+ protected function get_bulk_actions() {
global $comment_status;
$actions = array();
@@ -209,7 +254,7 @@ 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 )
@@ -225,14 +270,22 @@ 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;
?>
-
';
}
- 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();
@@ -295,40 +357,53 @@ 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' );
+ }
return $columns;
}
- function get_sortable_columns() {
+ /**
+ *
+ * @return array
+ */
+ protected function get_sortable_columns() {
return array(
'author' => 'comment_author',
'response' => 'comment_post_ID'
);
}
- 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' );
?>
-
+
print_column_headers(); ?>
-
-
- print_column_headers( false ); ?>
-
-
-
@@ -336,17 +411,34 @@ class WP_Comments_List_Table extends WP_List_Table {
+
+
+
+ print_column_headers( false ); ?>
+
+
+
display_tablenav( 'bottom' );
}
- function single_row( $a_comment ) {
+ /**
+ *
+ * @global WP_Post $post
+ * @global object $comment
+ *
+ * @param object $a_comment
+ */
+ public function single_row( $a_comment ) {
global $post, $comment;
$comment = $a_comment;
$the_comment_class = wp_get_comment_status( $comment->comment_ID );
+ if ( ! $the_comment_class ) {
+ $the_comment_class = '';
+ }
$the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) );
$post = get_post( $comment->comment_post_ID );
@@ -358,38 +450,139 @@ class WP_Comments_List_Table extends WP_List_Table {
echo "\n";
}
- function column_cb( $comment ) {
- if ( $this->user_can ) { ?>
-
-
- user_can;
+ if ( ! $this->user_can ) {
+ return;
+ }
- $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
$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" ) );
- $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+ $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';
- $url = "comment.php?c=$comment->comment_ID";
+ $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick Edit' ) );
- $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" );
+ $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 object $comment
+ */
+ public function column_cb( $comment ) {
+ if ( $this->user_can ) { ?>
+
+
+ comment_ID ) );
+
echo '';
@@ -411,7 +604,7 @@ class WP_Comments_List_Table extends WP_List_Table {
echo '';
comment_text();
- if ( $user_can ) { ?>
+ if ( $this->user_can ) { ?>