Changeset 61274 for branches/6.9/src/wp-includes/comment.php

Timestamp:

11/20/2025 01:58:35 PM (4 months ago)

Author:

wildworks

Message:

Notes: trash (or delete) child notes when parent is deleted.

Ensure that when a top level note is trashed (or deleted), all of its replies (children) are also trashed or deleted. If EMPTY_TRASH_DAYS is 0, notes are deleted immediately; otherwise they are marked as trash for later cleanup.

Reviewed by wildworks.
Merges [61248] to the 6.9 branch.

Props adamsilverstein, desrosj, wildworks, mamaduka, karthickmurugan, jeffpaul, shailu25.
See #64240.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/comment.php (modified) (3 diffs)

branches/6.9/src/wp-includes/comment.php

@@ -1575 +1575 @@
  *
  * @since 2.9.0
+ * @since 6.9.0 Any child notes are deleted when deleting a note.
  *
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
@@ -1581 +1582 @@
 function wp_trash_comment( $comment_id ) {
     if ( ! EMPTY_TRASH_DAYS ) {
-        return wp_delete_comment( $comment_id, true );
+        $comment = get_comment( $comment_id );
+        $success = wp_delete_comment( $comment_id, true );
+
+        if ( ! $success ) {
+            return false;
+        }
+
+        // Also delete children of top level 'note' type comments.
+        if ( $comment && 'note' === $comment->comment_type && 0 === (int) $comment->comment_parent ) {
+            $children = $comment->get_children(
+                array(
+                    'fields' => 'ids',
+                    'status' => 'all',
+                    'type'   => 'note',
+                )
+            );
+
+            foreach ( $children as $child_id ) {
+                if ( ! wp_delete_comment( $child_id, true ) ) {
+                    $success = false;
+                }
+            }
+        }
+
+        return $success;
     }
 
@@ -1616 +1641 @@
          */
         do_action( 'trashed_comment', $comment->comment_ID, $comment );
+
+        // For top level 'note' type comments, also trash children.
+        if ( 'note' === $comment->comment_type && 0 === (int) $comment->comment_parent ) {
+            $children = $comment->get_children(
+                array(
+                    'fields' => 'ids',
+                    'status' => 'all',
+                    'type'   => 'note',
+                )
+            );
+
+            $success = true;
+            foreach ( $children as $child_id ) {
+                if ( ! wp_trash_comment( $child_id ) ) {
+                    $success = false;
+                }
+            }
+            return $success;
+        }
 
         return true;