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

Timestamp:

07/29/2020 06:44:23 PM (4 years ago)

Author:

boonebgorges

Message:

Remove terms blacklist and whitelist in inline comments and local variables.

The change is in order to promote clearer and more inclusive language.

See #8339.

File:

• trunk/src/bp-core/bp-core-moderation.php (modified) (3 diffs)

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

@@ -142 +142 @@
 
     // Get the moderation keys.
-    $blacklist = trim( get_option( 'moderation_keys' ) );
-
-    // Bail if blacklist is empty.
-    if ( ! empty( $blacklist ) ) {
+    $disallowed = trim( get_option( 'moderation_keys' ) );
+
+    // Bail if list is empty.
+    if ( ! empty( $disallowed ) ) {
 
         // Get words separated by new lines.
-        $words = explode( "\n", $blacklist );
+        $words = explode( "\n", $disallowed );
 
         // Loop through words.
@@ -227 +227 @@
 
     // Get the moderation keys.
-    $blacklist = trim( get_option( 'blacklist_keys' ) );
-
-    // Bail if blacklist is empty.
-    if ( empty( $blacklist ) ) {
+    $disallowed = get_option( 'disallowed_keys' );
+
+    // Support for WP < 5.5.
+    if ( false === $disallowed ) {
+        $disallowed = get_option( 'blacklist_keys' );
+    }
+
+    $disallowed = trim( $disallowed );
+
+    // Bail if disallowed list is empty.
+    if ( empty( $disallowed ) ) {
         return true;
     }
@@ -263 +270 @@
 
     // Get words separated by new lines.
-    $words = explode( "\n", $blacklist );
+    $words = explode( "\n", $disallowed );
 
     // Loop through words.