Changeset 6127 for trunk/bp-activity/bp-activity-filters.php

Timestamp:

06/21/2012 06:46:36 PM (13 years ago)

Author:

djpaul

Message:

When a part of an activity item matches WordPress' word blacklist, allow the activity
to be recorded to the database, but mark it as spam. Fixes #4284.

File:

• trunk/bp-activity/bp-activity-filters.php (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -150 +150 @@
 
     // Only check specific types of activity updates
-    if ( !in_array( $activity->type, bp_activity_get_moderated_activity_types() ) )
+    if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) )
         return;
 
-    // Unset the activity component so activity stream update fails
-    if ( !bp_core_check_for_blacklist( $activity->user_id, '', $activity->content ) )
-        $activity->component = false;
+    // Mark as spam
+    if ( ! bp_core_check_for_blacklist( $activity->user_id, '', $activity->content ) )
+        bp_activity_mark_as_spam( $activity, 'by_blacklist' );
 }