Changeset 12698 for trunk/src/bp-activity/bp-activity-filters.php

Timestamp:

07/31/2020 02:26:38 PM (7 months ago)

Author:

boonebgorges

Message:

Remove 'whitelist' and 'blacklist' language from moderation checks.

This is part of a series of changes meant to promote clarity and
inclusiveness in the language used in our codebase.

See #8339.

File:

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

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

@@ -118 +118 @@
 // Activity stream moderation.
 add_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
-add_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2, 1 );
+add_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys',  2, 1 );
 
 /** Functions *****************************************************************/
@@ -173 +173 @@
  * Mark the posted activity as spam, if it contains disallowed keywords.
  *
- * @since 1.6.0
+ * @since 7.0.0
  *
  * @param BP_Activity_Activity $activity The activity object to check.
  */
-function bp_activity_check_blacklist_keys( $activity ) {
+function bp_activity_check_disallowed_keys( $activity ) {
 
     // Only check specific types of activity updates.
@@ -186 +186 @@
     // Send back the error so activity update fails.
     // @todo This is temporary until some kind of trash status is built.
-    $blacklist = bp_core_check_for_blacklist( $activity->user_id, '', $activity->content, 'wp_error' );
-    if ( is_wp_error( $blacklist ) ) {
-        $activity->errors = $blacklist;
+    $disallowed = bp_core_check_for_disallowed_keys( $activity->user_id, '', $activity->content, 'wp_error' );
+    if ( is_wp_error( $disallowed ) ) {
+        $activity->errors = $disallowed;
 
         // Backpat.