Changeset 11256 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

11/28/2016 10:33:55 PM (9 years ago)

Author:

djpaul

Message:

Fix incorrect remove_action and remove_filter usage for WordPress 4.7.

remove_action and remove_filter formally accepted a fourth parameter until WP 4.7; it's only with the introduction of the WP_Hook class that the function signature changed. Prior to WP 4.7, the fourth parameter was unused, so it does no harm to remove it and tidy things up.

Fixes #7318

Props ketuchetan

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (3 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -1446 +1446 @@
 
     // Remove the filter for future activity items.
-    remove_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
+    remove_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10 );
 
     return $action;
@@ -3322 +3322 @@
     // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
     if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
+        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4 );
 
         // Build data package for Akismet.
@@ -3369 +3369 @@
     // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
     if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
+        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4 );
 
         // Build data package for Akismet.