Ticket #41037: 41037.2.diff

src/wp-includes/capabilities.php

@@ -381 +381 @@
                         }
 
                         $post = get_post( $comment->comment_post_ID );
+                        $author = $comment->user_id;
 
+                        if ( ! (int) $author === 0 ) {
+                                $caps[] = 'do_not_allow';
+                                break;
+                        }
                         /*
                          * If the post doesn't exist, we have an orphaned comment.
                          * Fall back to the edit_posts capability, instead.
@@ -391 +396 @@
                         } else {
                                 $caps = map_meta_cap( 'edit_posts', $user_id );
                         }
+                        if ( (int) $author === $user_id ) {
+                                $caps = [$cap];
+                        }
                         break;
                 case 'unfiltered_upload':
                         if ( defined( 'ALLOW_UNFILTERED_UPLOADS' ) && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin( $user_id ) ) ) {
@@ -1047 +1055 @@
         return $allcaps;
 }
 
+/**
+ * Filters the user capabilities to grant the 'edit_comment' capability as necessary.
+ *
+ * @since 5.4
+ *
+ * @param bool[]   $allcaps An array of all the user's capabilities.
+ * @param string[] $caps    Required primitive capabilities for the requested capability.
+ * @param array    $args {
+ *     Arguments that accompany the requested capability check.
+ *
+ *     @type string    $0 Requested capability.
+ *     @type int       $1 Concerned user ID.
+ *     @type mixed  ...$2 Optional second and further parameters, typically object ID.
+ * }
+ * @param WP_User  $user    The user object.
+ * @return bool[] Filtered array of the user's capabilities.
+ */
+function wp_maybe_grant_edit_comment($allcaps, $caps, $args, $user ) {
+        if( in_array('edit_comment', $caps) ) {
+                $allcaps['edit_comment'] = true;
+        }
+
+        return $allcaps;
+}
+
 return;
 
 // Dummy gettext calls to get strings in the catalog.

src/wp-includes/default-filters.php

@@ -582 +582 @@
 add_filter( 'user_has_cap', 'wp_maybe_grant_install_languages_cap', 1 );
 add_filter( 'user_has_cap', 'wp_maybe_grant_resume_extensions_caps', 1 );
 add_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps', 1, 4 );
+add_filter( 'user_has_cap', 'wp_maybe_grant_edit_comment', 1, 5);
 
 unset( $filter, $action );