Changeset 13114 for trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php

Timestamp:

09/24/2021 01:54:39 AM (4 years ago)

Author:

imath

Message:

Make sure deleting an activity comment also deletes its children

This commit also takes care of redirecting the user to the activity single view when clicking on the comment button and there is no comment form available for the corresponding activity. This case can happen on a single member's activity stream when the main activity is an activity comment.

Props yesbutmaybeno

Fixes #8415

File:

• trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php (modified) (4 diffs)

trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 8.1.0
+ * @version 10.0.0
  */
 
@@ -233 +233 @@
     // Deleting an activity comment.
     if ( ! empty( $_POST['is_comment'] ) ) {
+        // Get replies before they are deleted.
+        $replies   = (array) BP_Activity_Activity::get_child_comments( $activity->id );
+        $reply_ids = wp_list_pluck( $replies, 'id' );
+
         if ( ! bp_activity_delete_comment( $activity->item_id, $activity->id ) ) {
             wp_send_json_error( $response );
+
+            // The comment and its replies has been deleted successfully.
+        } else {
+            $response = array(
+                'deleted' => array_merge(
+                    array( $activity->id ),
+                    $reply_ids
+                ),
+            );
         }
 
@@ -241 +254 @@
         if ( ! bp_activity_delete( array( 'id' => $activity->id, 'user_id' => $activity->user_id ) ) ) {
             wp_send_json_error( $response );
+
+            // The activity has been deleted successfully.
+        } else {
+            $response = array(
+                'deleted' => array( $activity->id ),
+            );
         }
     }
@@ -246 +265 @@
     /** This action is documented in bp-activity/bp-activity-actions.php */
     do_action( 'bp_activity_action_delete_activity', $activity->id, $activity->user_id );
-
-    // The activity has been deleted successfully
-    $response = array( 'deleted' => $activity->id );
 
     // If on a single activity redirect to user's home.