enmi-conf.org: comparison wp/wp-admin/includes/class-wp-comments-list-table.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 /**
 * Core class used to implement displaying comments in a list table.
 *
 * @since 3.1.0
-* @access private
 *
 * @see WP_List_Table
 */
 class WP_Comments_List_Table extends WP_List_Table {
 			'approved'  => 'approve',
 			'all'       => '',
 		);
 		$args = array(
-			'status'    => isset( $status_map[ $comment_status ] ) ? $status_map[ $comment_status ] : $comment_status,
+			'status'                    => isset( $status_map[ $comment_status ] ) ? $status_map[ $comment_status ] : $comment_status,
-			'search'    => $search,
+			'search'                    => $search,
-			'user_id'   => $user_id,
+			'user_id'                   => $user_id,
-			'offset'    => $start,
+			'offset'                    => $start,
-			'number'    => $number,
+			'number'                    => $number,
-			'post_id'   => $post_id,
+			'post_id'                   => $post_id,
-			'type'      => $comment_type,
+			'type'                      => $comment_type,
-			'orderby'   => $orderby,
+			'orderby'                   => $orderby,
-			'order'     => $order,
+			'order'                     => $order,
-			'post_type' => $post_type,
+			'post_type'                 => $post_type,
+			'update_comment_post_cache' => true,
 		);
 		/**
 		 * Filters the arguments for the comment query in the comments list table.
 		 *
 		$args = apply_filters( 'comments_list_table_query_args', $args );
 		$_comments = get_comments( $args );
 		if ( is_array( $_comments ) ) {
-			update_comment_cache( $_comments );
 			$this->items       = array_slice( $_comments, 0, $comments_per_page );
 			$this->extra_items = array_slice( $_comments, $comments_per_page );
 			$_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) );
 		$total_comments = get_comments(
 			array_merge(
 				$args,
 				array(
-					'count'  => true,
+					'count'   => true,
-					'offset' => 0,
+					'offset'  => 0,
-					'number' => 0,
+					'number'  => 0,
+					'orderby' => 'none',
 				)
 			)
 		);
 		$this->set_pagination_args(
 		global $post_id, $comment_status, $comment_type;
 		$status_links = array();
 		$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
-		$stati = array(
+		$statuses = array(
 			/* translators: %s: Number of comments. */
 			'all'       => _nx_noop(
 				'All <span class="count">(%s)</span>',
 				'All <span class="count">(%s)</span>',
 				'comments'
 				'comments'
 			),
 		);
 		if ( ! EMPTY_TRASH_DAYS ) {
-			unset( $stati['trash'] );
+			unset( $statuses['trash'] );
 		}
 		$link = admin_url( 'edit-comments.php' );
 		if ( ! empty( $comment_type ) && 'all' !== $comment_type ) {
 			$link = add_query_arg( 'comment_type', $comment_type, $link );
 		}
-		foreach ( $stati as $status => $label ) {
+		foreach ( $statuses as $status => $label ) {
-			$current_link_attributes = '';
-			if ( $status === $comment_status ) {
-				$current_link_attributes = ' class="current" aria-current="page"';
-			}
 			if ( 'mine' === $status ) {
 				$current_user_id    = get_current_user_id();
 				$num_comments->mine = get_comments(
 					array(
 						'post_id' => $post_id ? $post_id : 0,
 						'user_id' => $current_user_id,
 						'count'   => true,
+						'orderby' => 'none',
 					)
 				);
 				$link               = add_query_arg( 'user_id', $current_user_id, $link );
 			} else {
 				$link = remove_query_arg( 'user_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 ] = "<a href='$link'$current_link_attributes>" . sprintf(
+			$status_links[ $status ] = array(
-				translate_nooped_plural( $label, $num_comments->$status ),
+				'url'     => esc_url( $link ),
-				sprintf(
+				'label'   => sprintf(
-					'<span class="%s-count">%s</span>',
+					translate_nooped_plural( $label, $num_comments->$status ),
-					( 'moderated' === $status ) ? 'pending' : $status,
+					sprintf(
-					number_format_i18n( $num_comments->$status )
+						'<span class="%s-count">%s</span>',
-				)
+						( 'moderated' === $status ) ? 'pending' : $status,
-			) . '</a>';
+						number_format_i18n( $num_comments->$status )
+					)
+				),
+				'current' => $status === $comment_status,
+			);
 		}
 		/**
 		 * Filters the comment status links.
 		 *
 		 * @since 5.1.0 The 'Mine' link was added.
 		 *
 		 * @param string[] $status_links An associative array of fully-formed comment status links. Includes 'All', 'Mine',
 		 *                              'Pending', 'Approved', 'Spam', and 'Trash'.
 		 */
-		return apply_filters( 'comment_status_links', $status_links );
+		return apply_filters( 'comment_status_links', $this->get_views_links( $status_links ) );
 	}
 	/**
 	 * @global string $comment_status
 	 *
 		 *
 		 * @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'.
+		 * @param string $which          The location of the extra table nav markup: Either 'top' or 'bottom'.
 		 */
 		do_action( 'manage_comments_nav', $comment_status, $which );
 		echo '</div>';
 	}
 	}
 	/**
 	 * @global int $post_id
 	 *
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		global $post_id;
 		$columns = array();
 				'pings'   => __( 'Pings' ),
 			)
 		);
 		if ( $comment_types && is_array( $comment_types ) ) {
-			printf( '<label class="screen-reader-text" for="filter-by-comment-type">%s</label>', __( 'Filter by comment type' ) );
+			printf(
+				'<label class="screen-reader-text" for="filter-by-comment-type">%s</label>',
+				/* translators: Hidden accessibility text. */
+				__( 'Filter by comment type' )
+			);
 			echo '<select id="filter-by-comment-type" name="comment_type">';
 			printf( "\t<option value=''>%s</option>", __( 'All comment types' ) );
 			foreach ( $comment_types as $type => $label ) {
 				if ( get_comments(
 					array(
-						'number' => 1,
+						'count'   => true,
-						'type'   => $type,
+						'orderby' => 'none',
+						'type'    => $type,
 					)
 				) ) {
 					printf(
 						"\t<option value='%s'%s>%s</option>\n",
 						esc_attr( $type ),
 	/**
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'author'   => 'comment_author',
+			'author'   => array( 'comment_author', false, __( 'Author' ), __( 'Table ordered by Comment Author.' ) ),
-			'response' => 'comment_post_ID',
+			'response' => array( 'comment_post_ID', false, _x( 'In Response To', 'column name' ), __( 'Table ordered by Post Replied To.' ) ),
 			'date'     => 'comment_date',
 		);
 	}
 	/**
-	 * Get the name of the default primary column.
+	 * Gets the name of the default primary column.
 	 *
 	 * @since 4.3.0
 	 *
 	 * @return string Name of the default primary column, in this case, 'comment'.
 	 */
 		$this->screen->render_screen_reader_content( 'heading_list' );
 		?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+		<?php
+		if ( ! isset( $_GET['orderby'] ) ) {
+			// In the initial view, Comments are ordered by comment's date but there's no column for that.
+			echo '<caption class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Ordered by Comment Date, descending.' ) .
+			'</caption>';
+		} else {
+			$this->print_table_description();
+		}
+		?>
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
 	</tr>
 	</thead>
 	 * @param WP_Comment $item
 	 */
 	public function single_row( $item ) {
 		global $post, $comment;
+		// Restores the more descriptive, specific name for use within this method.
 		$comment = $item;
+		if ( $comment->comment_post_ID > 0 ) {
+			$post = get_post( $comment->comment_post_ID );
+		}
+		$edit_post_cap = $post ? 'edit_post' : 'edit_posts';
+		if ( ! current_user_can( $edit_post_cap, $comment->comment_post_ID )
+			&& ( post_password_required( $comment->comment_post_ID )
+				|| ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+		) {
+			// The user has no access to the post and thus cannot see the comments.
+			return false;
+		}
 		$the_comment_class = wp_get_comment_status( $comment );
 		if ( ! $the_comment_class ) {
 			$the_comment_class = '';
 		}
 		$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 "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
 		$this->single_row_columns( $comment );
 		unset( $GLOBALS['post'], $GLOBALS['comment'] );
 	}
 	/**
-	 * Generate and display row actions links.
+	 * Generates and displays row actions links.
 	 *
 	 * @since 4.3.0
 	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global string $comment_status Status for the current listed comments.
 		if ( ! $this->user_can ) {
 			return '';
 		}
 		// Restores the more descriptive, specific name for use within this method.
-		$comment            = $item;
+		$comment = $item;
 		$the_comment_status = wp_get_comment_status( $comment );
-		$out = '';
+		$output = '';
 		$del_nonce     = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
 		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
 		$url = "comment.php?c=$comment->comment_ID";
 		if ( 'excerpt' === $mode ) {
 			$always_visible = true;
 		}
-		$out .= '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
+		$output .= '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		$i = 0;
 		foreach ( $actions as $action => $link ) {
 			++$i;
 			if ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i )
 				|| 1 === $i
 			) {
-				$sep = '';
+				$separator = '';
 			} else {
-				$sep = ' | ';
+				$separator = ' | ';
 			}
 			// Reply and quickedit need a hide-if-no-js span when not added with Ajax.
 			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
 				$action .= ' hide-if-no-js';
 				} else {
 					$action .= ' unapprove';
 				}
 			}
-			$out .= "<span class='$action'>$sep$link</span>";
+			$output .= "<span class='$action'>{$separator}{$link}</span>";
 		}
-		$out .= '</div>';
+		$output .= '</div>';
-		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$output .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
-		return $out;
+			__( 'Show more details' ) .
+		'</span></button>';
+		return $output;
 	}
 	/**
 	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 		// Restores the more descriptive, specific name for use within this method.
 		$comment = $item;
 		if ( $this->user_can ) {
 			?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
 		<input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
+		<label for="cb-select-<?php echo $comment->comment_ID; ?>">
+			<span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Select comment' );
+			?>
+			</span>
+		</label>
 			<?php
 		}
 	}
 	/**
 			/** This filter is documented in wp-admin/includes/comment.php */
 			$comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
 			?>
 		<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
 			<textarea class="comment" rows="1" cols="1"><?php echo esc_textarea( $comment_content ); ?></textarea>
-			<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
+			<div class="author-email"><?php echo esc_html( $comment->comment_author_email ); ?></div>
-			<div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
+			<div class="author"><?php echo esc_html( $comment->comment_author ); ?></div>
 			<div class="author-url"><?php echo esc_url( $comment->comment_author_url ); ?></div>
 			<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
 		</div>
 			<?php
 		}
 	 *
 	 * @param WP_Comment $item        The comment object.
 	 * @param string     $column_name The custom column's name.
 	 */
 	public function column_default( $item, $column_name ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$comment = $item;
 		/**
 		 * 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 string $comment_id  The comment ID as a numeric string.
 		 */
-		do_action( 'manage_comments_custom_column', $column_name, $item->comment_ID );
+		do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
 	}
 }

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef