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

Timestamp:

11/28/2016 10:33:55 PM (8 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-blogs/bp-blogs-activity.php (modified) (3 diffs)

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

@@ -548 +548 @@
 
         // Use comments_open().
-        remove_filter( 'comments_open', 'bp_comments_open', 10, 2 );
+        remove_filter( 'comments_open', 'bp_comments_open', 10 );
         $open = comments_open( $activity->secondary_item_id );
         add_filter( 'comments_open', 'bp_comments_open', 10, 2 );
@@ -807 +807 @@
 
     // Prevent separate activity entry being made.
-    remove_action( 'comment_post', 'bp_activity_post_type_comment', 10, 2 );
+    remove_action( 'comment_post', 'bp_activity_post_type_comment', 10 );
 
     // Handle multisite.
@@ -971 +971 @@
 
     // No need to edit the activity, as it's the activity who's updating the comment
-    remove_action( 'transition_comment_status',     'bp_activity_transition_post_type_comment_status', 10, 3 );
-    remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment',          10, 4 );
+    remove_action( 'transition_comment_status', 'bp_activity_transition_post_type_comment_status', 10 );
+    remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment', 10 );
 
     if ( 1 === $activity->is_spam && 'spam' !== $post_comment_status ) {