Ticket #8296: 8296.2.patch

src/bp-activity/bp-activity-cache.php

@@ -47 +47 @@
 function bp_activity_clear_cache_for_activity( $activity ) {
         wp_cache_delete( $activity->id, 'bp_activity' );
         wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
+
+        // Also clear the comments cache for the parent activity ID.
+        if ( 'activity_comment' === $activity->type ) {
+                wp_cache_delete( $activity->item_id, 'bp_activity_comments' );
+        }
 }
 add_action( 'bp_activity_after_save', 'bp_activity_clear_cache_for_activity' );
 

src/bp-activity/bp-activity-functions.php

@@ -3547 +3547 @@
         // Clear the activity stream first page cache.
         wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
 
+        if ( 'activity_comment' === $activity->type ) {
+                $activity_id = $activity->item_id;
+        } else {
+                $activity_id = $activity->id;
+
+                // Clear the activity cache for this activity item.
+                wp_cache_delete( $activity->id, 'bp_activity' );
+        }
+
         // Clear the activity comment cache for this activity item.
-        wp_cache_delete( $activity->id, 'bp_activity_comments' );
+        wp_cache_delete( $activity_id, 'bp_activity_comments' );
 
         // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
         if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
@@ -3594 +3603 @@
         // Clear the activity stream first page cache.
         wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
 
-        // Clear the activity comment cache for this activity item.
-        wp_cache_delete( $activity->id, 'bp_activity_comments' );
+        if ( 'activity_comment' === $activity->type ) {
+                $activity_id = $activity->item_id;
+        } else {
+                $activity_id = $activity->id;
+
+                // Clear the activity cache for this activity item.
+                wp_cache_delete( $activity->id, 'bp_activity' );
+        }
+
+        // Purge comment cache for the root activity update.
+        wp_cache_delete( $activity_id, 'bp_activity_comments' );
 
         // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
         if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {