X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..af50974463450c98503e763a7836a50e260461a9:/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 fd25129b..3814f98b 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 __construct() {
+ 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;
@@ -33,14 +43,15 @@ class WP_Comments_List_Table extends WP_List_Table {
'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 );
@@ -120,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();
@@ -168,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 ),
@@ -176,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 )
@@ -204,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;
?>
-
';
}
- function current_action() {
+ public function current_action() {
if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
return 'delete_all';
return parent::current_action();
}
- function get_columns() {
+ public function get_columns() {
global $post_id;
$columns = array();
@@ -260,22 +312,20 @@ class WP_Comments_List_Table extends WP_List_Table {
return $columns;
}
- function get_sortable_columns() {
+ protected function get_sortable_columns() {
return array(
'author' => 'comment_author',
'response' => 'comment_post_ID'
);
}
- function display() {
- extract( $this->_args );
-
+ public function display() {
wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
$this->display_tablenav( 'top' );
?>
-
+
print_column_headers(); ?>
@@ -288,11 +338,11 @@ class WP_Comments_List_Table extends WP_List_Table {
-
-
@@ -301,38 +351,38 @@ class WP_Comments_List_Table extends WP_List_Table {
$this->display_tablenav( 'bottom' );
}
- function single_row( $a_comment ) {
- global $post, $comment, $the_comment_status;
+ public function single_row( $a_comment ) {
+ global $post, $comment;
$comment = $a_comment;
- $the_comment_status = wp_get_comment_status( $comment->comment_ID );
+ $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 ) );
$post = get_post( $comment->comment_post_ID );
$this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
- echo "";
+ echo "\n";
}
- function column_cb( $comment ) {
- if ( $this->user_can )
- echo "";
+ public function column_cb( $comment ) {
+ if ( $this->user_can ) { ?>
+
+
+ user_can;
$comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
-
- $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 );
+ $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" ) );
@@ -349,11 +399,17 @@ class WP_Comments_List_Table extends WP_List_Table {
$delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
}
+ 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' ) ),
- /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
+ /* 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 );
@@ -366,7 +422,10 @@ class WP_Comments_List_Table extends WP_List_Table {
comment_text();
if ( $user_can ) { ?>
';
if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
echo $thumb;
}
- function column_default( $comment, $column_name ) {
+ public function column_default( $comment, $column_name ) {
+ /**
+ * Fires when the default column output is displayed for a single row.
+ *
+ * @since 2.8.0
+ *
+ * @param string $column_name The custom column's name.
+ * @param int $comment->comment_ID The custom column's unique ID number.
+ */
do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
}
}
@@ -519,7 +595,7 @@ class WP_Comments_List_Table extends WP_List_Table {
*/
class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
- function get_column_info() {
+ protected function get_column_info() {
$this->_column_headers = array(
array(
'author' => __( 'Author' ),
@@ -532,28 +608,31 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
return $this->_column_headers;
}
- function get_table_classes() {
+ protected function get_table_classes() {
$classes = parent::get_table_classes();
$classes[] = 'comments-box';
return $classes;
}
- function display( $output_empty = false ) {
- extract( $this->_args );
+ public function display( $output_empty = false ) {
+ $singular = $this->_args['singular'];
wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
?>
-