Changeset 57123

Timestamp:

11/17/2023 05:09:09 PM (3 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-comments-list-table.php (modified) (2 diffs)
• class-wp-list-table.php (modified) (2 diffs)
• dashboard.php (modified) (2 diffs)

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

@@ -639 +639 @@
                 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 );
@@ -649 +664 @@
                 $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'>";

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

@@ -829 +829 @@
          */
         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();
 
@@ -851 +862 @@
                         $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 ) {

trunk/src/wp-admin/includes/dashboard.php

@@ -1089 +1089 @@
 
                 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;
                         }
@@ -1110 +1116 @@
                 echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
                 foreach ( $comments as $comment ) {
-                        $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 )
-                                )
-                        ) {
-                                _wp_dashboard_recent_comments_row( $comment );
-                        }
+                        _wp_dashboard_recent_comments_row( $comment );
                 }
                 echo '</ul>';