Changeset 13114 for trunk/src/bp-activity/bp-activity-template.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-activity/bp-activity-template.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-template.php

@@ -2678 +2678 @@
         if ( bp_is_activity_component() && is_numeric( bp_current_action() ) ) {
             $class = 'delete-activity-single';
+        } elseif ( 'activity_comment' === bp_get_activity_type() ) {
+            $class = 'acomment-delete';
         }
 
@@ -2714 +2716 @@
         global $activities_template;
 
-        $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . $activities_template->activity->id );
+        $activity_id = 0;
+        if ( isset( $activities_template->activity->id ) ) {
+            $activity_id = (int) $activities_template->activity->id;
+        }
+
+        $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . $activity_id );
 
         // Determine if we're on a single activity page, and customize accordingly.
         if ( bp_is_activity_component() && is_numeric( bp_current_action() ) ) {
             $url = add_query_arg( array( 'redirect_to' => wp_get_referer() ), $url );
+        } elseif ( 'activity_comment' === bp_get_activity_type() ) {
+            $url = add_query_arg( 'cid', $activity_id, $url );
         }