Changeset 2675 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

02/11/2010 02:50:47 PM (15 years ago)

Author:

apeatling

Message:

Added missing pre_save filters to activity saving. Fixed bug where a user could leave/join a group quickly multiple times and flood the activity stream.

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -47 +47 @@
         global $wpdb, $bp, $current_user;
 
-        do_action( 'bp_activity_before_save', $this );
+        do_action( 'bp_activity_before_save', &$this );
+
+        $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, &$this );
+        $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, &$this );
+        $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, &$this );
+        $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, &$this );
+        $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, &$this );
+        $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, &$this );
+        $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, &$this );
+        $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, &$this );
+        $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, &$this );
+        $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, &$this );
+        $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, &$this );
+        $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, &$this );
+        $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, &$this );
 
         if ( !$this->component || !$this->type )
@@ -67 +81 @@
             $this->id = $wpdb->insert_id;
 
-        do_action( 'bp_activity_after_save', $this );
+        do_action( 'bp_activity_after_save', &$this );
         return true;
     }
@@ -280 +294 @@
             return false;
 
+        error_log( $where_sql );
+
         /* Fetch the activity IDs so we can delete any comments for this activity item */
         $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );