Changeset 9831 for trunk/src/bp-core/classes/class-bp-attachment.php

Timestamp:

05/02/2015 08:55:07 PM (11 years ago)

Author:

imath

Message:

Make sure the BP Attachments API behaves the right way when WordPress < 4.0

Before WordPress 4.0, there was no dynamic filter based on the name of the action posted in the upload form. So we also need to filter wp_handle_upload_prefilter to make sure the BP_Attachments->validate_upload() function will actually validate the uploads for versions of WordPress < 4.0.

Improve the i18n of the avatar type error, as the avatar types can now be filtered in the BP_Attachment_Avatar class.

Add unit tests for the BP Attachement class.

Fixes #6278

File:

• trunk/src/bp-core/classes/class-bp-attachment.php (modified) (2 diffs)

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

@@ -220 +220 @@
                 add_filter( "{$this->action}_prefilter", array( $this, 'validate_upload' ), 10, 1 );
 
+                /**
+                 * The above dynamic filter was introduced in WordPress 4.0, as we support WordPress
+                 * back to 3.6, we need to also use the pre 4.0 static filter and remove it after
+                 * the upload was processed.
+                 */
+                add_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10, 1 );
+
                 // Set Default overrides
                 $overrides = array(
@@ -265 +272 @@
                 // Restore WordPress Uploads data
                 remove_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
+
+                // Remove the pre WordPress 4.0 static filter
+                remove_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10, 1 );
 
                 // Finally return the uploaded file or the error