Changeset 6855 for trunk/src/includes/forums/functions.php

Timestamp:

08/22/2018 03:11:02 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Moderation: remove references to blacklist/whitelist verbiage.

This change combines 2 functions into 1, merging _blacklist() checks into _moderation() checks. A new $strict parameter is added, when set to true will continue to check against the WordPress blacklist_keys option name.

• Tests updated
• bbp_check_for_blacklist() deprecated
• Error response keys renamed (non breaking - nothing relies on them)
• Some docs updates

Fixes #3215. For 2.6.

File:

• trunk/src/includes/forums/functions.php (modified) (2 diffs)

trunk/src/includes/forums/functions.php

@@ -235 +235 @@
     }
 
-    /** Forum Blacklist *******************************************************/
-
-    if ( ! bbp_check_for_blacklist( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
-        bbp_add_error( 'bbp_forum_blacklist', __( '<strong>ERROR</strong>: Your forum cannot be created at this time.', 'bbpress' ) );
+    /** Forum Bad Words *******************************************************/
+
+    if ( ! bbp_check_for_moderation( $anonymous_data, $forum_author, $forum_title, $forum_content, true ) ) {
+        bbp_add_error( 'bbp_forum_moderation', __( '<strong>ERROR</strong>: Your forum cannot be created at this time.', 'bbpress' ) );
     }
 
@@ -474 +474 @@
     }
 
-    /** Forum Blacklist *******************************************************/
-
-    if ( ! bbp_check_for_blacklist( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
-        bbp_add_error( 'bbp_forum_blacklist', __( '<strong>ERROR</strong>: Your forum cannot be edited at this time.', 'bbpress' ) );
+    /** Forum Bad Words *******************************************************/
+
+    if ( ! bbp_check_for_moderation( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content, true ) ) {
+        bbp_add_error( 'bbp_forum_moderation', __( '<strong>ERROR</strong>: Your forum cannot be edited at this time.', 'bbpress' ) );
     }