Ticket #7674: .patch

bp-core/bp-core-attachments.php

@@ -1314 +1314 @@
         $cover_subdir = $object_data['dir'] . '/' . $bp_params['item_id'] . '/cover-image';
         $cover_dir    = trailingslashit( $bp_attachments_uploads_dir['basedir'] ) . $cover_subdir;
 
-        if ( 0 !== validate_file( $cover_dir ) || ! is_dir( $cover_dir ) ) {
+        if ( ! is_dir( $cover_dir ) ) {
                 // Upload error response.
                 bp_attachments_json_response( false, $is_html4, array(
                         'type'    => 'upload_error',

bp-core/classes/class-bp-attachment-cover-image.php

@@ -38 +38 @@
                         // Specific errors for cover images.
                         'upload_error_strings'  => array(
                                 11  => sprintf( __( 'That image is too big. Please upload one smaller than %s', 'buddypress' ), size_format( $max_upload_file_size ) ),
-                                12  => sprintf( _n( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'buddypress' ), self::get_cover_image_types( $allowed_types ) ),
+                12  => sprintf( _n( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'buddypress' ), self::get_cover_image_types( $allowed_types ) ),
+                13  => __( 'There was a problem uploading the cover image.', 'buddypress' )
                         ),
                 ) );
         }
@@ -77 +78 @@
                 // File size is too big.
                 if ( $file['size'] > $this->original_max_filesize ) {
                         $file['error'] = 11;
-
                 // File is of invalid type.
                 } elseif ( ! bp_attachments_check_filetype( $file['tmp_name'], $file['name'], bp_attachments_get_allowed_mimes( 'cover_image' ) ) ) {
                         $file['error'] = 12;
-                }
+                } else if( 0 !== validate_file( $file['name'] ) ) {
+            $file['error'] = 13;
+        }
 
                 // Return with error code attached.
                 return $file;