Ticket #6591: 6591.02.patch

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

@@ -41 +41 @@
                                 9  => sprintf( __( 'That photo is too big. Please upload one smaller than %s', 'buddypress' ), size_format( bp_core_avatar_original_max_filesize() ) ),
                                 10 => sprintf( _n( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'buddypress' ), self::get_avatar_types( $allowed_types ) ),
                         ),
+
+                        // Make sure no argument will be passed to our upload dir filters
+                        'upload_dir_filter_arg' => 0,
                 ) );
         }
 

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

@@ -41 +41 @@
                 'file_input'            => '',
                 'upload_error_strings'  => array(),
                 'required_wp_files'     => array( 'file' ),
+                'upload_dir_filter_arg' => 1,
         );
 
         /**
@@ -91 +92 @@
                         } elseif ( 'base_dir' === $key ) {
                                 $this->{$key} = sanitize_title( $param );
 
+                        // Sanitize the upload dir filter arg to pass
+                        } elseif ( 'upload_dir_filter_arg' === $key ) {
+                                $this->{$key} = (int) $param;
+
                         // Action & File input are already set and sanitized
                         } elseif ( 'action' !== $key && 'file_input' !== $key ) {
                                 $this->{$key} = $param;
@@ -268 +273 @@
 
                 // Make sure the file will be uploaded in the attachment directory
                 if ( ! empty( $upload_dir_filter ) ) {
-                        add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
+                        add_filter( 'upload_dir', $upload_dir_filter, 10, $this->upload_dir_filter_arg );
                 }
 
                 // Upload the attachment
@@ -276 +281 @@
 
                 // Restore WordPress Uploads data
                 if ( ! empty( $upload_dir_filter ) ) {
-                        remove_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
+                        remove_filter( 'upload_dir', $upload_dir_filter, 10, $this->upload_dir_filter_arg );
                 }
 
                 // Remove the pre WordPress 4.0 static filter

tests/phpunit/testcases/core/class-bp-attachment.php

@@ -328 +328 @@
                 // clean up!
                 $this->clean_files();
         }
+
+        /**
+         * @group upload
+         * @group avatar
+         */
+        public function test_bp_attachment_upload_dir_filter_arg() {
+                $attachment_class = new BPTest_Attachment_Extension( array(
+                        'action'                => 'attachment_action',
+                        'file_input'            => 'attachment_file_input',
+                        'base_dir'                  => 'attachment_base_dir',
+                ) );
+
+                $this->assertTrue( 1 === $attachment_class->upload_dir_filter_arg );
+
+                $avatar_attachment = new BP_Attachment_Avatar();
+
+                $this->assertTrue( 0 === $avatar_attachment->upload_dir_filter_arg );
+        }
 }