Coding Standards: Rewrite a few capability checks for clarity and readability.

This aims to:
* Perform the checks as early as possible to avoid redundant function calls.
* Remove an empty conditiaonal branch and make the exit conditions clearer.
* Bring the formatting in line with other multi-line conditionals in core.

Follow-up to [56836].

See #59650.
Built from https://develop.svn.wordpress.org/trunk@57123


git-svn-id: http://core.svn.wordpress.org/trunk@56634 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/class-wp-comments-list-table.php

@@ -638,8 +638,23 @@ class WP_Comments_List_Table extends WP_List_Table {
 	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 )
+			&& ( ! empty( $post->post_password )
+				|| ! 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 ) {
@@ -648,25 +663,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$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 );
 
-		$edit_post_cap = $post ? 'edit_post' : 'edit_posts';
-		if (
-			current_user_can( $edit_post_cap, $comment->comment_post_ID ) ||
-			(
-				empty( $post->post_password ) &&
-				current_user_can( 'read_post', $comment->comment_post_ID )
-			)
-		) {
-			// The user has access to the post and thus can see comments.
-		} else {
-			return false;
-		}
-
 		echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
 		$this->single_row_columns( $comment );
 		echo "</tr>\n";

wp-admin/includes/class-wp-list-table.php

@@ -828,6 +828,17 @@ class WP_List_Table {
 	 * @param int $pending_comments Number of pending comments.
 	 */
 	protected function comments_bubble( $post_id, $pending_comments ) {
+		$post_object   = get_post( $post_id );
+		$edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
+
+		if ( ! current_user_can( $edit_post_cap, $post_id )
+			&& ( ! empty( $post_object->post_password )
+				|| ! current_user_can( 'read_post', $post_id ) )
+		) {
+			// The user has no access to the post and thus cannot see the comments.
+			return false;
+		}
+
 		$approved_comments = get_comments_number();
 
 		$approved_comments_number = number_format_i18n( $approved_comments );
@@ -851,20 +862,6 @@ class WP_List_Table {
 			$pending_comments_number
 		);
 
-		$post_object   = get_post( $post_id );
-		$edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
-		if (
-			current_user_can( $edit_post_cap, $post_id ) ||
-			(
-				empty( $post_object->post_password ) &&
-				current_user_can( 'read_post', $post_id )
-			)
-		) {
-			// The user has access to the post and thus can see comments.
-		} else {
-			return false;
-		}
-
 		if ( ! $approved_comments && ! $pending_comments ) {
 			// No comments at all.
 			printf(

wp-admin/includes/dashboard.php

@@ -1088,7 +1088,13 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 		}
 
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
+			$comment_post = get_post( $comment->comment_post_ID );
+
+			if ( ! current_user_can( 'edit_post', $comment->comment_post_ID )
+				&& ( ! empty( $comment_post->post_password )
+					|| ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+			) {
+				// The user has no access to the post and thus cannot see the comments.
 				continue;
 			}
 
@@ -1109,16 +1115,7 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
 		foreach ( $comments as $comment ) {
-			$comment_post = get_post( $comment->comment_post_ID );
+			_wp_dashboard_recent_comments_row( $comment );
-			if (
-				current_user_can( 'edit_post', $comment->comment_post_ID ) ||
-				(
-					empty( $comment_post->post_password ) &&
-					current_user_can( 'read_post', $comment->comment_post_ID )
-				)
-			) {
-				_wp_dashboard_recent_comments_row( $comment );
-			}
 		}
 		echo '</ul>';
 

wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-alpha-57122';
+$wp_version = '6.5-alpha-57123';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.