diff -r 34716fd837a4 -r be944660c56a wp/wp-admin/includes/class-wp-comments-list-table.php --- a/wp/wp-admin/includes/class-wp-comments-list-table.php Tue Dec 15 15:52:01 2020 +0100 +++ b/wp/wp-admin/includes/class-wp-comments-list-table.php Wed Sep 21 18:19:35 2022 +0200 @@ -61,11 +61,11 @@ * @since 3.1.0 * * @param string $name Comment author name. - * @param int $comment_ID Comment ID. + * @param int $comment_id Comment ID. * @return string Avatar with the user name. */ - public function floated_admin_avatar( $name, $comment_ID ) { - $comment = get_comment( $comment_ID ); + public function floated_admin_avatar( $name, $comment_id ) { + $comment = get_comment( $comment_id ); $avatar = get_avatar( $comment, 32, 'mystery' ); return "$avatar $name"; } @@ -95,6 +95,7 @@ } $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all'; + if ( ! in_array( $comment_status, array( 'all', 'mine', 'moderated', 'approved', 'spam', 'trash' ), true ) ) { $comment_status = 'all'; } @@ -162,6 +163,7 @@ $args = apply_filters( 'comments_list_table_query_args', $args ); $_comments = get_comments( $args ); + if ( is_array( $_comments ) ) { update_comment_cache( $_comments ); @@ -198,6 +200,7 @@ */ public function get_per_page( $comment_status = 'all' ) { $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' ); + /** * Filters the number of comments listed per page in the comments list table. * @@ -284,6 +287,7 @@ } $link = admin_url( 'edit-comments.php' ); + if ( ! empty( $comment_type ) && 'all' !== $comment_type ) { $link = add_query_arg( 'comment_type', $comment_type, $link ); } @@ -312,15 +316,19 @@ if ( ! isset( $num_comments->$status ) ) { $num_comments->$status = 10; } + $link = add_query_arg( 'comment_status', $status, $link ); + if ( $post_id ) { $link = add_query_arg( 'p', absint( $post_id ), $link ); } + /* // 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( wp_unslash( $_REQUEST['s'] ) ), $link ); */ + $status_links[ $status ] = "" . sprintf( translate_nooped_plural( $label, $num_comments->$status ), sprintf( @@ -352,12 +360,15 @@ global $comment_status; $actions = array(); + if ( in_array( $comment_status, array( 'all', 'approved' ), true ) ) { $actions['unapprove'] = __( 'Unapprove' ); } + if ( in_array( $comment_status, array( 'all', 'moderated' ), true ) ) { $actions['approve'] = __( 'Approve' ); } + if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ), true ) ) { $actions['spam'] = _x( 'Mark as spam', 'comment' ); } @@ -390,11 +401,14 @@ if ( ! isset( $has_items ) ) { $has_items = $this->has_items(); } + echo '
'; + if ( 'top' === $which ) { ob_start(); - $this->comment_status_dropdown( $comment_type ); + $this->comment_type_dropdown( $comment_type ); + /** * Fires just before the Filter submit button for comment types. * @@ -406,23 +420,29 @@ if ( ! empty( $output ) && $this->has_items() ) { echo $output; - submit_button( esc_html__( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); + submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } } - if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) { + if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && $has_items + && 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, 'apply', 'delete_all', false ); } + /** * Fires after the Filter submit button for comment types. * * @since 2.5.0 + * @since 5.6.0 The `$which` parameter was added. * * @param string $comment_status The comment status name. Default 'All'. + * @param string $which The location of the extra table nav markup: 'top' or 'bottom'. */ - do_action( 'manage_comments_nav', $comment_status ); + do_action( 'manage_comments_nav', $comment_status, $which ); + echo '
'; } @@ -465,34 +485,35 @@ } /** - * Displays a comment status drop-down for filtering on the Comments list table. + * Displays a comment type drop-down for filtering on the Comments list table. * * @since 5.5.0 + * @since 5.6.0 Renamed from `comment_status_dropdown()` to `comment_type_dropdown()`. * * @param string $comment_type The current comment type slug. */ - protected function comment_status_dropdown( $comment_type ) { + protected function comment_type_dropdown( $comment_type ) { /** - * Filters the comment types dropdown menu. + * Filters the comment types shown in the drop-down menu on the Comments list table. * * @since 2.7.0 * - * @param array $comment_types An array of comment types. Accepts 'Comments', 'Pings'. + * @param string[] $comment_types Array of comment type labels keyed by their name. */ $comment_types = apply_filters( 'admin_comment_types_dropdown', array( - 'comment' => esc_html__( 'Comments' ), - 'pings' => esc_html__( 'Pings' ), + 'comment' => __( 'Comments' ), + 'pings' => __( 'Pings' ), ) ); if ( $comment_types && is_array( $comment_types ) ) { - printf( '', esc_html__( 'Filter by comment type' ) ); + printf( '', __( 'Filter by comment type' ) ); echo ''; + + echo ''; } } @@ -548,6 +570,7 @@ if ( ! isset( $has_items ) ) { $has_items = $this->has_items(); + if ( $has_items ) { $this->display_tablenav( 'top' ); } @@ -604,14 +627,17 @@ $comment = $item; $the_comment_class = wp_get_comment_status( $comment ); + if ( ! $the_comment_class ) { $the_comment_class = ''; } - $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) ); + + $the_comment_class = implode( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) ); if ( $comment->comment_post_ID > 0 ) { $post = get_post( $comment->comment_post_ID ); } + $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); echo ""; @@ -824,7 +850,7 @@ } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status ) || ( 'unspam' === $action && 'spam' === $the_comment_status ) ) { - if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) { + if ( '1' === get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) { $action .= ' approve'; } else { $action .= ' unapprove'; @@ -863,6 +889,7 @@ if ( $comment->comment_parent ) { $parent = get_comment( $comment->comment_parent ); + if ( $parent ) { $parent_link = esc_url( get_comment_link( $parent ) ); $name = get_comment_author( $parent ); @@ -902,6 +929,7 @@ $author_url = get_comment_author_url( $comment ); $author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) ); + if ( strlen( $author_url_display ) > 50 ) { $author_url_display = wp_html_excerpt( $author_url_display, 49, '…' ); } @@ -909,6 +937,7 @@ echo ''; comment_author( $comment ); echo '
'; + if ( ! empty( $author_url_display ) ) { printf( '%s
', esc_url( $author_url ), esc_html( $author_url_display ) ); } @@ -924,6 +953,7 @@ } $author_ip = get_comment_author_IP( $comment ); + if ( $author_ip ) { $author_ip_url = add_query_arg( array( @@ -932,9 +962,11 @@ ), admin_url( 'edit-comments.php' ) ); + if ( 'spam' === $comment_status ) { $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url ); } + printf( '%2$s', esc_url( $author_ip_url ), esc_html( $author_ip ) ); } } @@ -947,13 +979,14 @@ $submitted = sprintf( /* translators: 1: Comment date, 2: Comment time. */ __( '%1$s at %2$s' ), - /* translators: Comment date format. See https://www.php.net/date */ + /* translators: Comment date format. See https://www.php.net/manual/datetime.format.php */ get_comment_date( __( 'Y/m/d' ), $comment ), - /* translators: Comment time format. See https://www.php.net/date */ + /* translators: Comment time format. See https://www.php.net/manual/datetime.format.php */ get_comment_date( __( 'g:i a' ), $comment ) ); echo '
'; + if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) { printf( '%s', @@ -963,6 +996,7 @@ } else { echo $submitted; } + echo '
'; } @@ -992,18 +1026,23 @@ } echo '
'; + if ( 'attachment' === $post->post_type ) { $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ); if ( $thumb ) { echo $thumb; } } + echo $post_link; + $post_type_object = get_post_type_object( $post->post_type ); echo "" . $post_type_object->labels->view_item . ''; + echo ''; $this->comments_bubble( $post->ID, $pending_comments ); echo ' '; + echo '
'; } @@ -1018,7 +1057,7 @@ * @since 2.8.0 * * @param string $column_name The custom column's name. - * @param int $comment_ID The custom column's unique ID number. + * @param int $comment_id The custom column's unique ID number. */ do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID ); }