X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..80e421fa26a0ef412d7c67749a64a6c1919d515a:/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..cf0ab88a 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -21,7 +21,7 @@ class WP_Comments_List_Table extends WP_List_Table { var $pending_count = array(); - function __construct() { + function __construct( $args = array() ) { global $post_id; $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0; @@ -33,6 +33,7 @@ class WP_Comments_List_Table extends WP_List_Table { 'plural' => 'comments', 'singular' => 'comment', 'ajax' => true, + 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, ) ); } @@ -81,7 +82,8 @@ class WP_Comments_List_Table extends WP_List_Table { $status_map = array( 'moderated' => 'hold', - 'approved' => 'approve' + 'approved' => 'approve', + 'all' => '', ); $args = array( @@ -130,13 +132,13 @@ class WP_Comments_List_Table extends WP_List_Table { 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; + global $post_id, $comment_status, $comment_type; $status_links = array(); $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments(); @@ -186,7 +188,7 @@ class WP_Comments_List_Table extends WP_List_Table { $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' ) ) ) $actions['spam'] = _x( 'Mark as Spam', 'comment' ); @@ -224,13 +226,14 @@ class WP_Comments_List_Table extends WP_List_Table { ?> 'post-query-submit' ) ); + do_action( 'restrict_manage_comments' ); + submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) ); } if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) { wp_nonce_field( 'bulk-destroy', '_destroy_nonce' ); $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' ); - submit_button( $title, 'button-secondary apply', 'delete_all', false ); + submit_button( $title, 'apply', 'delete_all', false ); } do_action( 'manage_comments_nav', $comment_status ); echo ''; @@ -288,11 +291,11 @@ class WP_Comments_List_Table extends WP_List_Table { -
+ display_rows_or_placeholder(); ?> - + items = $this->extra_items; $this->display_rows(); ?> @@ -302,34 +305,39 @@ class WP_Comments_List_Table extends WP_List_Table { } function single_row( $a_comment ) { - global $post, $comment, $the_comment_status; + global $post, $comment; $comment = $a_comment; - $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + $the_comment_class = join( ' ', get_comment_class( wp_get_comment_status( $comment->comment_ID ) ) ); $post = get_post( $comment->comment_post_ID ); $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); - echo "