Changeset 11256 for trunk/src/bp-core/classes/class-bp-attachment.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-core/classes/class-bp-attachment.php (modified) (1 diff)

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

@@ -274 +274 @@
         // 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.