Changeset 5642

Timestamp:

01/21/2012 10:41:47 AM (13 years ago)

Author:

djpaul

Message:

Prevent duplicate activity emails when updating group forum topics. Fixes #3936, superprops r-a-y

File:

• trunk/bp-groups/bp-groups-forums.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-forums.php

@@ -136 +136 @@
 
     if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id, 'topic_tags' => $topic_tags ) ) ) {
-        // Update the activity stream item
-        if ( bp_is_active( 'activity' ) )
-            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
+
+        // Get the corresponding activity item
+        if ( bp_is_active( 'activity' ) ) {
+            $id = bp_activity_get_activity_id( array(
+                    'item_id'           => $bp->groups->current_group->id,
+                    'secondary_item_id' => $topic_id,
+                    'component'         => $bp->groups->id,
+                    'type'              => 'new_forum_topic'
+            ) );
+        }
 
         $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
@@ -145 +152 @@
         // Record this in activity streams
         groups_record_activity( array(
+            'id'                => $id,
             'action'            => apply_filters_ref_array( 'groups_activity_new_forum_topic_action',  array( $activity_action,  $topic_text, &$topic ) ),
             'content'           => apply_filters_ref_array( 'groups_activity_new_forum_topic_content', array( $activity_content, $topic_text, &$topic ) ),