Changeset 12695

Timestamp:

07/30/2020 09:10:40 PM (4 years ago)

Author:

imath

Message:

Core: use the right option name for moderation disallowed keys

Since WordPress 5.5 the blacklist_keys option name has been deprecated in favor of the disallowed_keys one. Depending on the installed WordPress version, this commit makes sure we use the right option name.

Props boonebgorges

Fixes #8338 (branch 6.0)

File:

• branches/6.0/src/bp-core/bp-core-moderation.php (modified) (2 diffs)

branches/6.0/src/bp-core/bp-core-moderation.php

@@ -191 +191 @@
  * @since 2.6.0 Added $error_type parameter.
  *
- * @todo Why don't we use wp_blacklist_check() for this?
+ * @todo Why don't we use wp_check_comment_disallowed_list() for this?
  *
  * @param int    $user_id    User ID.
@@ -225 +225 @@
     /** Blacklist ************************************************************
      */
+    $disallowed_keys_option_name = 'blacklist_keys';
+    if ( function_exists( 'wp_check_comment_disallowed_list' ) ) {
+        $disallowed_keys_option_name = 'disallowed_keys';
+    }
 
     // Get the moderation keys.
-    $blacklist = trim( get_option( 'blacklist_keys' ) );
+    $blacklist = trim( get_option( $disallowed_keys_option_name ) );
 
     // Bail if blacklist is empty.