Ticket #4222: 4222.02.patch

bp-activity/bp-activity-filters.php

@@ -230 +230 @@
                         continue;
 
                 // If an activity_id is provided, we can send email and BP notifications
-                if ( $activity_id ) {
+                if ( $activity_id && apply_filters( 'bp_activity_at_name_do_notifications', true ) ) {
                         bp_activity_at_message_notification( $activity_id, $user_id );
                 }
 

bp-activity/bp-activity-classes.php

@@ -91 +91 @@
                 if ( false === $wpdb->query( $q ) )
                         return false;
 
+                // If this is a new activity item, set the $id property
                 if ( empty( $this->id ) )
                         $this->id = $wpdb->insert_id;
 
+                // If an existing activity item, prevent any changes to the content generating new @mention notifications.
+                else
+                        add_filter( 'bp_activity_at_name_do_notifications', '__return_false' );
+
                 do_action_ref_array( 'bp_activity_after_save', array( &$this ) );
 
                 return true;