Ticket #7318: 7318.patch

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

@@ -393 +393 @@
                                          * Remove moderation and blacklist checks in case we want to ham an activity
                                          * which contains one of these listed keys.
                                          */
-                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
-                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2, 1 );
+                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2 );
+                                        remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2 );
 
                                         bp_activity_mark_as_ham( $activity );
                                         $result = $activity->save();

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

@@ -603 +603 @@
         ob_end_clean();
 
         // Remove the temporary filter.
-        remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+        remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10 );
 
         if ( ! empty( $newest_activities['last_recorded'] ) ) {
                 $response['bp_activity_newest_activities'] = $newest_activities;

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

@@ -1445 +1445 @@
         $action = apply_filters( 'bp_activity_generate_action_string', $activity->action, $activity );
 
         // 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;
 }
@@ -3321 +3321 @@
 
         // 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.
                 $activity_data = BP_Akismet::build_akismet_data_package( $activity );
@@ -3368 +3368 @@
 
         // 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.
                 $activity_data = BP_Akismet::build_akismet_data_package( $activity );

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

@@ -547 +547 @@
                 switch_to_blog( $blog_id );
 
                 // 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 );
 
@@ -806 +806 @@
         );
 
         // 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.
         switch_to_blog( $parent_activity->item_id );
@@ -970 +970 @@
         $old_comment_status  = $post_comment_status;
 
         // 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 ) {
                 wp_spam_comment( $post_comment_id );

src/bp-core/admin/bp-core-admin-functions.php

@@ -1141 +1141 @@
 
         $loader = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
 
-        remove_action( "after_plugin_row_{$loader}", 'wp_plugin_update_row', 10, 2 );
+        remove_action( "after_plugin_row_{$loader}", 'wp_plugin_update_row', 10 );
         add_action( "after_plugin_row_{$loader}", 'bp_core_admin_php52_plugin_row', 10, 2 );
 }
 add_action( 'load-plugins.php', 'bp_core_admin_maybe_disable_update_row_for_php53_requirement', 100 );

src/bp-core/bp-core-functions.php

@@ -2372 +2372 @@
                 return;
         }
 
-        remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
+        remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10 );
 }
 add_action( 'bp_init', 'bp_remove_adjacent_posts_rel_link' );
 

src/bp-core/classes/class-bp-attachment.php

@@ -273 +273 @@
 
                 // Restore WordPress Uploads data.
                 if ( ! empty( $upload_dir_filter ) ) {
-                        remove_filter( 'upload_dir', $upload_dir_filter, 10, $this->upload_dir_filter_args );
+                        remove_filter( 'upload_dir', $upload_dir_filter, 10 );
                 }
 
                 // Remove the pre WordPress 4.0 static filter.
-                remove_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10, 1 );
+                remove_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10 );
 
                 // Finally return the uploaded file or the error.
                 return $this->attachment;

src/bp-core/deprecated/2.5.php

@@ -62 +62 @@
                 'settings-verify-email-change',
         );
 
-        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' );
         add_filter( 'bp_email_get_property', 'bp_core_deprecated_email_filters', 20, 4 );

src/bp-members/bp-members-functions.php

@@ -1162 +1162 @@
         // As of BuddyPress 2.0, last_activity is no longer stored in usermeta.
         // However, we mirror it there for backward compatibility. Do not use!
         // Remove our warning and re-add.
-        remove_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
-        remove_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );
+        remove_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10 );
+        remove_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10 );
         bp_update_user_meta( $user_id, 'last_activity', $time );
         add_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
         add_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );

src/bp-members/classes/class-bp-members-admin.php

@@ -1306 +1306 @@
          * @since 2.1.0
          */
         public function remove_edit_profile_url_filter() {
-                remove_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10, 3 );
+                remove_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10 );
         }
 
         /** Signups Management ****************************************************/

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -969 +969 @@
         }
 
         if ( ! empty( $last_recorded ) ) {
-                remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+                remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10 );
         }
 
         exit;

src/bp-xprofile/bp-xprofile-filters.php

@@ -328 +328 @@
  * - URL's are made clickable.
  *
  * To disable globally:
- *     remove_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9, 3 );
+ *     remove_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9 );
  *
  * To disable for a single field, use the 'Autolink' settings in Dashboard > Users > Profile Fields.
  *