Ticket #7331: 7331.01.patch

src/bp-activity/classes/class-bp-activity-activity.php

@@ -692 +692 @@
                                 bp_activity_update_meta_cache( $activity_ids );
                         }
 
-                        if ( $activities && $r['display_comments'] ) {
+                        if ( $activities && $r['display_comments'] === 'threaded' ) {
                                 $activities = BP_Activity_Activity::append_comments( $activities, $r['spam'] );
                         }