Changeset 12698 for trunk/src/bp-core/bp-core-moderation.php

Timestamp:

07/31/2020 02:26:38 PM (6 years 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-core/bp-core-moderation.php (modified) (5 diffs)

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' ) );
                                 }
                         }