Changeset 11256 for trunk/src/bp-core/deprecated/2.5.php

Timestamp:

11/28/2016 10:33:55 PM (10 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-core/deprecated/2.5.php (modified) (2 diffs)

trunk/src/bp-core/deprecated/2.5.php

@@ -63 +63 @@
         );
 
-        remove_filter( 'bp_email_get_property', 'bp_core_deprecated_email_filters', 20, 4 );
+        remove_filter( 'bp_email_get_property', 'bp_core_deprecated_email_filters', 20 );
         $email_type = $email->get( 'type' );
         $tokens     = $email->get( 'tokens' );
@@ -702 +702 @@
         );
 
-        remove_action( 'bp_send_email_success', 'bp_core_deprecated_email_actions', 20, 2 );
+        remove_action( 'bp_send_email_success', 'bp_core_deprecated_email_actions', 20 );
         $email_content = $email->get( 'content' );
         $email_subject = $email->get( 'subject' );