Changeset 12698

Timestamp:

07/31/2020 02:26:38 PM (6 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.

Location:

trunk/src

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-activity/bp-activity-filters.php (modified) (3 diffs)
• bp-core/bp-core-moderation.php (modified) (5 diffs)
• bp-core/deprecated/7.0.php (added)
• class-buddypress.php (modified) (1 diff)

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

@@ -400 +400 @@
                      */
                     remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2 );
-                    remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys', 2 );
+                    remove_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys', 2 );
 
                     bp_activity_mark_as_ham( $activity );

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.

trunk/src/bp-core/bp-core-moderation.php

@@ -188 +188 @@
  * Check for blocked keys.
  *
- * @since 1.6.0
- * @since 2.6.0 Added $error_type parameter.
- *
- * @todo Why don't we use wp_blacklist_check() for this?
+ * @since 7.0.0
  *
  * @param int    $user_id    User ID.
@@ -199 +196 @@
  * @return bool|WP_Error True if test is passed, false if fail.
  */
-function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
+function bp_core_check_for_disallowed_keys( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
 
     /**
@@ -205 +202 @@
      *
      * @since 2.2.0
+     * @deprecated 7.0.0 Use 'bp_bypass_check_for_disallowed_keys' instead.
      *
      * @param bool   $value   Whether or not to bypass checking. Default false.
@@ -211 +209 @@
      * @param string $content $the content being posted.
      */
-    if ( apply_filters( 'bp_bypass_check_for_blacklist', false, $user_id, $title, $content ) ) {
+    if ( apply_filters_deprecated( 'bp_bypass_check_for_blacklist', array( false, $user_id, $title, $content ), '7.0.0', 'bp_bypass_check_for_disallowed_keys' ) ) {
+        return true;
+    }
+
+    /**
+     * Filters whether or not to bypass checking for blocked keys.
+     *
+     * @since 7.0.0
+     *
+     * @param bool   $value   Whether or not to bypass checking. Default false.
+     * @param int    $user_id Topic of reply author ID.
+     * @param string $title   The title of the content.
+     * @param string $content $the content being posted.
+     */
+    if ( apply_filters( 'bp_bypass_check_for_disallowed_keys', false, $user_id, $title, $content ) ) {
         return true;
     }
@@ -294 +306 @@
                     return false;
                 } else {
-                    return new WP_Error( 'bp_moderation_blacklist_match', _x( 'You have posted an inappropriate word.', 'Comment blacklist', 'buddypress' ) );
+                    return new WP_Error( 'bp_moderation_disallowed_key_match', _x( 'You have posted an inappropriate word.', 'Comment disallowed key', 'buddypress' ) );
                 }
             }

trunk/src/class-buddypress.php

@@ -511 +511 @@
             require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
             require( $this->plugin_dir . 'bp-core/deprecated/6.0.php' );
+            require( $this->plugin_dir . 'bp-core/deprecated/7.0.php' );
         }