X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/85ad385665744d9cc3bcd939906309be7268edb3..88550bc3400cc7c035ff590ecb007c7938041ded:/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 3fa1d7c2..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 __construct( $args = array() ) {
+ 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;
@@ -37,11 +47,11 @@ class WP_Comments_List_Table extends WP_List_Table {
) );
}
- 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';
@@ -125,7 +135,7 @@ 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.
@@ -139,7 +149,7 @@ class WP_Comments_List_Table extends WP_List_Table {
return $comments_per_page;
}
- function no_items() {
+ public function no_items() {
global $comment_status;
if ( 'moderated' == $comment_status )
@@ -148,7 +158,7 @@ class WP_Comments_List_Table extends WP_List_Table {
_e( 'No comments found.' );
}
- function get_views() {
+ protected function get_views() {
global $post_id, $comment_status, $comment_type;
$status_links = array();
@@ -201,7 +211,7 @@ class WP_Comments_List_Table extends WP_List_Table {
return $status_links;
}
- function get_bulk_actions() {
+ protected function get_bulk_actions() {
global $comment_status;
$actions = array();
@@ -209,7 +219,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,15 +235,16 @@ 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();
@@ -301,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(); ?>
@@ -342,7 +351,7 @@ class WP_Comments_List_Table extends WP_List_Table {
$this->display_tablenav( 'bottom' );
}
- function single_row( $a_comment ) {
+ public function single_row( $a_comment ) {
global $post, $comment;
$comment = $a_comment;
@@ -358,7 +367,7 @@ class WP_Comments_List_Table extends WP_List_Table {
echo "
\n";
}
- function column_cb( $comment ) {
+ public function column_cb( $comment ) {
if ( $this->user_can ) { ?>
@@ -366,7 +375,7 @@ class WP_Comments_List_Table extends WP_List_Table {
}
}
- function column_comment( $comment ) {
+ public function column_comment( $comment ) {
global $comment_status;
$post = get_post();
@@ -426,7 +435,7 @@ class WP_Comments_List_Table extends WP_List_Table {
}
if ( $user_can ) {
- // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
+ // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
$actions = array(
'approve' => '', 'unapprove' => '',
'reply' => '',
@@ -436,7 +445,8 @@ class WP_Comments_List_Table extends WP_List_Table {
'trash' => '', 'untrash' => '', 'delete' => ''
);
- if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
+ // Not looking at all comments.
+ if ( $comment_status && 'all' != $comment_status ) {
if ( 'approved' == $the_comment_status )
$actions['unapprove'] = "" . __( 'Unapprove' ) . '';
else if ( 'unapproved' == $the_comment_status )
@@ -446,11 +456,13 @@ class WP_Comments_List_Table extends WP_List_Table {
$actions['unapprove'] = "" . __( 'Unapprove' ) . '';
}
- if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
+ 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' ) . '';
- } elseif ( 'trash' == $the_comment_status ) {
+ }
+
+ if ( 'trash' == $the_comment_status ) {
$actions['untrash'] = "" . __( 'Restore' ) . '';
}
@@ -462,8 +474,12 @@ class WP_Comments_List_Table extends WP_List_Table {
if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
$actions['edit'] = "". __( 'Edit' ) . '';
- $actions['quickedit'] = '' . __( 'Quick Edit' ) . '';
- $actions['reply'] = '' . __( 'Reply' ) . '';
+
+ $format = '%s';
+
+ $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
+
+ $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
}
/** This filter is documented in wp-admin/includes/dashboard.php */
@@ -491,7 +507,7 @@ class WP_Comments_List_Table extends WP_List_Table {
}
}
- function column_author( $comment ) {
+ public function column_author( $comment ) {
global $comment_status;
$author_url = get_comment_author_url();
@@ -510,22 +526,23 @@ class WP_Comments_List_Table extends WP_List_Table {
comment_author_email_link();
echo '
';
}
- echo '';
- comment_author_IP();
- echo '';
+
+ $author_ip = get_comment_author_IP();
+ if ( $author_ip ) {
+ $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
+ if ( 'spam' == $comment_status ) {
+ $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
+ }
+ printf( '%s', esc_url( $author_ip_url ), $author_ip );
+ }
}
}
- function column_date( $comment ) {
+ public function column_date() {
return get_comment_date( __( 'Y/m/d \a\t g:ia' ) );
}
- function column_response( $comment ) {
+ public function column_response() {
$post = get_post();
if ( isset( $this->pending_count[$post->ID] ) ) {
@@ -537,9 +554,9 @@ class WP_Comments_List_Table extends WP_List_Table {
if ( current_user_can( 'edit_post', $post->ID ) ) {
$post_link = "";
- $post_link .= get_the_title( $post->ID ) . '';
+ $post_link .= esc_html( get_the_title( $post->ID ) ) . '';
} else {
- $post_link = get_the_title( $post->ID );
+ $post_link = esc_html( get_the_title( $post->ID ) );
}
echo '';
@@ -553,7 +570,7 @@ class WP_Comments_List_Table extends WP_List_Table {
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.
*
@@ -578,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' ),
@@ -591,26 +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' );
?>
-