Ticket #6683: 6683.patch

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

@@ -537 +537 @@
                         'activities'     => null,
                         'total'          => null,
                         'has_more_items' => null,
+                        'stream_mode'    => $r['display_comments'],
                 );
 
                 /**

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

@@ -248 +248 @@
 
                 $this->has_more_items = $this->activities['has_more_items'];
 
+                // Add the stream mode to inform how activity comments are displayed
+                $this->stream_mode = $this->activities['stream_mode'];
+
                 $this->activities = $this->activities['activities'];
 
                 if ( $max ) {

src/bp-members/bp-members-filters.php

@@ -127 +127 @@
         return apply_filters( 'bp_members_edit_profile_url', $profile_link, $url, $user_id, $scheme );
 }
 add_filter( 'edit_profile_url', 'bp_members_edit_profile_url', 10, 3 );
+
+
+/**
+ * Makes sure to avoid duplicate comments on the Just Me scope.
+ *
+ * @since  2.6.0
+ *
+ * @param  bool $can_comment True if the user can comment the activity. False otherwise.
+ * @return bool              Unchanged if Activity stream mode is not 'stream'. False otherwise.
+ */
+function bp_members_comments_avoid_duplicates( $can_comment ) {
+        global $activities_template;
+
+        if ( 'stream' === $activities_template->stream_mode && bp_is_current_action( 'just-me' ) ) {
+                if ( ! empty( $activities_template->activity->children ) ) {
+                        $activities_template->activity->children = array();
+                }
+
+                $can_comment = false;
+        }
+
+        return $can_comment;
+}
+add_filter( 'bp_activity_can_comment', 'bp_members_comments_avoid_duplicates' );