<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12698] trunk/src: Remove 'whitelist' and 'blacklist' language from moderation checks.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12698">12698</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12698","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-31 14:26:38 +0000 (Fri, 31 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/8339">#8339</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityadminphp">trunk/src/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfiltersphp">trunk/src/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunksrcbpcorebpcoremoderationphp">trunk/src/bp-core/bp-core-moderation.php</a></li>
<li><a href="#trunksrcclassbuddypressphp">trunk/src/class-buddypress.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbpcoredeprecated70php">trunk/src/bp-core/deprecated/7.0.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-admin.php 2020-07-31 14:26:24 UTC (rev 12697)
+++ trunk/src/bp-activity/bp-activity-admin.php 2020-07-31 14:26:38 UTC (rev 12698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * which contains one of these listed keys.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys', 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys', 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_activity_mark_as_ham( $activity );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $activity->save();
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-filters.php 2020-07-31 14:26:24 UTC (rev 12697)
+++ trunk/src/bp-activity/bp-activity-filters.php 2020-07-31 14:26:38 UTC (rev 12698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Activity stream moderation.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys', 2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys', 2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Functions *****************************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,11 +172,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Mark the posted activity as spam, if it contains disallowed keywords.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.6.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 7.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_Activity_Activity $activity The activity object to check.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_activity_check_blacklist_keys( $activity ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_activity_check_disallowed_keys( $activity ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only check specific types of activity updates.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,9 +185,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send back the error so activity update fails.
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo This is temporary until some kind of trash status is built.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blacklist = bp_core_check_for_blacklist( $activity->user_id, '', $activity->content, 'wp_error' );
- if ( is_wp_error( $blacklist ) ) {
- $activity->errors = $blacklist;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $disallowed = bp_core_check_for_disallowed_keys( $activity->user_id, '', $activity->content, 'wp_error' );
+ if ( is_wp_error( $disallowed ) ) {
+ $activity->errors = $disallowed;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Backpat.
</span><span class="cx" style="display: block; padding: 0 10px"> $activity->component = false;
</span></span></pre></div>
<a id="trunksrcbpcorebpcoremoderationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-moderation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-moderation.php 2020-07-31 14:26:24 UTC (rev 12697)
+++ trunk/src/bp-core/bp-core-moderation.php 2020-07-31 14:26:38 UTC (rev 12698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,11 +187,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Check for blocked keys.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.6.0
- * @since 2.6.0 Added $error_type parameter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 7.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo Why don't we use wp_blacklist_check() for this?
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title The title of the content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content The content being posted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,12 +195,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $error_type The error type to return. Either 'bool' or 'wp_error'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error True if test is passed, false if fail.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_check_for_disallowed_keys( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether or not to bypass checking for blocked keys.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 7.0.0 Use 'bp_bypass_check_for_disallowed_keys' instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $value Whether or not to bypass checking. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id Topic of reply author ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,10 +208,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title The title of the content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content $the content being posted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( apply_filters( 'bp_bypass_check_for_blacklist', false, $user_id, $title, $content ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( apply_filters_deprecated( 'bp_bypass_check_for_blacklist', array( false, $user_id, $title, $content ), '7.0.0', 'bp_bypass_check_for_disallowed_keys' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if super admin is author.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_super_admin( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'bool' === $error_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'bp_moderation_blacklist_match', _x( 'You have posted an inappropriate word.', 'Comment blacklist', 'buddypress' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'bp_moderation_disallowed_key_match', _x( 'You have posted an inappropriate word.', 'Comment disallowed key', 'buddypress' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated70php"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-core/deprecated/7.0.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/7.0.php (rev 0)
+++ trunk/src/bp-core/deprecated/7.0.php 2020-07-31 14:26:38 UTC (rev 12698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,45 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Deprecated functions.
+ *
+ * @deprecated 7.0.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Mark the posted activity as spam, if it contains disallowed keywords.
+ *
+ * Use bp_activity_check_disallowed_keys() instead.
+ *
+ * @since 1.6.0
+ * @deprecated 7.0.0
+ *
+ * @param BP_Activity_Activity $activity The activity object to check.
+ */
+function bp_activity_check_blacklist_keys( $activity ) {
+ _deprecated_function( __FUNCTION__, '7.0.0', 'bp_activity_check_disallowed_keys()' );
+ return bp_activity_check_disallowed_keys( $activity );
+}
+
+/**
+ * Check for blocked keys.
+ *
+ * Use bp_core_check_for_disallowed_keys() instead.
+ *
+ * @since 1.6.0
+ * @since 2.6.0 Added $error_type parameter.
+ * @deprecated 7.0.0
+ *
+ * @param int $user_id User ID.
+ * @param string $title The title of the content.
+ * @param string $content The content being posted.
+ * @param string $error_type The error type to return. Either 'bool' or 'wp_error'.
+ * @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' ) {
+ _deprecated_function( __FUNCTION__, '7.0.0', 'bp_core_check_for_disallowed_keys()' );
+ return bp_core_check_for_disallowed_keys( $user_id, $title, $content, $error_type );
+}
</ins></span></pre></div>
<a id="trunksrcclassbuddypressphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/class-buddypress.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/class-buddypress.php 2020-07-31 14:26:24 UTC (rev 12697)
+++ trunk/src/class-buddypress.php 2020-07-31 14:26:38 UTC (rev 12698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,6 +510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( $this->plugin_dir . 'bp-core/deprecated/3.0.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require( $this->plugin_dir . 'bp-core/deprecated/6.0.php' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require( $this->plugin_dir . 'bp-core/deprecated/7.0.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load wp-cli module if PHP 5.4+.
</span></span></pre>
</div>
</div>
</body>
</html>