X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/includes/class-wp-comments-list-table.php?ds=sidebyside diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 90c158fe..35a193f1 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -17,11 +17,21 @@ */ 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; @@ -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' ); - parent::WP_List_Table( array( + parent::__construct( array( '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'); } - 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'; @@ -51,6 +62,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 +94,8 @@ class WP_Comments_List_Table extends WP_List_Table { $status_map = array( 'moderated' => 'hold', - 'approved' => 'approve' + 'approved' => 'approve', + 'all' => '', ); $args = array( @@ -94,6 +108,7 @@ class WP_Comments_List_Table extends WP_List_Table { 'type' => $comment_type, 'orderby' => $orderby, 'order' => $order, + 'post_type' => $post_type, ); $_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 = array_unique( $_comment_post_ids ); + $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' ); + /** + * 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; } - function no_items() { + public function no_items() { global $comment_status; if ( 'moderated' == $comment_status ) - _e( 'No comments awaiting moderation… yet.' ); + _e( 'No comments awaiting moderation.' ); 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(); @@ -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'] ) ) - $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( translate_nooped_plural( $label, $num_comments->$status ), @@ -174,19 +199,27 @@ class WP_Comments_List_Table extends WP_List_Table { ) . ''; } + /** + * 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; } - 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' ); - if ( in_array( $comment_status, array( 'all', 'moderated', 'spam' ) ) ) + 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 ) @@ -202,46 +235,67 @@ class WP_Comments_List_Table extends WP_List_Table { return $actions; } - function extra_tablenav( $which ) { + protected function extra_tablenav( $which ) { global $comment_status, $comment_type; ?>