Ticket #8339: 8339-activity.diff

src/bp-activity/bp-activity-admin.php

@@ -399 +399 @@
                                          * which contains one of these listed keys.
                                          */
                                         remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2 );
-                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys', 2 );
+                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys', 2 );
 
                                         bp_activity_mark_as_ham( $activity );
                                         $result = $activity->save();

src/bp-activity/bp-activity-filters.php

@@ -117 +117 @@
 
 // Activity stream moderation.
 add_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
-add_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2, 1 );
+add_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys',  2, 1 );
 
 /** Functions *****************************************************************/
 
@@ -172 +172 @@
 /**
  * Mark the posted activity as spam, if it contains disallowed keywords.
  *
- * @since 1.6.0
+ * @since 7.0.0
  *
  * @param BP_Activity_Activity $activity The activity object to check.
  */
-function bp_activity_check_blacklist_keys( $activity ) {
+function bp_activity_check_disallowed_keys( $activity ) {
 
         // Only check specific types of activity updates.
         if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) ) {
@@ -185 +185 @@
 
         // Send back the error so activity update fails.
         // @todo This is temporary until some kind of trash status is built.
-        $blacklist = bp_core_check_for_blacklist( $activity->user_id, '', $activity->content, 'wp_error' );
-        if ( is_wp_error( $blacklist ) ) {
-                $activity->errors = $blacklist;
+        $disallowed = bp_core_check_for_disallowed_keys( $activity->user_id, '', $activity->content, 'wp_error' );
+        if ( is_wp_error( $disallowed ) ) {
+                $activity->errors = $disallowed;
 
                 // Backpat.
                 $activity->component = false;

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

@@ -187 +187 @@
 /**
  * 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.
  * @param string $title      The title of the content.
@@ -198 +195 @@
  * @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' ) {
+function bp_core_check_for_disallowed_keys( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
 
         /**
          * Filters whether or not to bypass checking for blocked keys.
          *
          * @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.
+         * @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_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_blacklist', false, $user_id, $title, $content ) ) {
+        if ( apply_filters( 'bp_bypass_check_for_disallowed_keys', false, $user_id, $title, $content ) ) {
                 return true;
         }
 
@@ -293 +305 @@
                                 if ( 'bool' === $error_type ) {
                                         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' ) );
                                 }
                         }
                 }

src/bp-groups/screens/single/admin/group-settings.php

@@ -104 +104 @@
          */
         bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/home' ) );
 }
-add_action( 'bp_screens', 'groups_screen_group_admin_settings' );
- No newline at end of file
+add_action( 'bp_screens', 'groups_screen_group_admin_settings' );

src/class-buddypress.php

@@ -510 +510 @@
                         require( $this->plugin_dir . 'bp-core/deprecated/3.0.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/6.0.php' );
+                        require( $this->plugin_dir . 'bp-core/deprecated/7.0.php' );
                 }
 
                 // Load wp-cli module if PHP 5.4+.