Ticket #8643: 8643.3.patch

src/bp-core/bp-core-attachments.php

@@ -156 +156 @@
  * Get allowed types for any attachment.
  *
  * @since 2.4.0
+ * @since 11.0.0 Adds the support for .webp images to Avatars and Cover images.
  *
  * @param string $type The extension types to get.
  *                     Default: 'avatar'.
@@ -163 +164 @@
  */
 function bp_attachments_get_allowed_types( $type = 'avatar' ) {
         // Defaults to BuddyPress supported image extensions.
-        $exts    = array( 'jpeg', 'gif', 'png' );
-        $wp_exts = wp_get_ext_types();
+        $exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+        if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
+                $exts[] = 'webp';
+        }
 
-        /**
-         * It's not a BuddyPress feature, get the allowed extensions
-         * matching the $type requested.
-         */
-        if ( 'avatar' !== $type && 'cover_image' !== $type ) {
+        // Avatar and cover image are images.
+        if ( 'image' !== $type && 'avatar' !== $type && 'cover_image' !== $type ) {
                 // Reset the default exts.
-                $exts = array();
+                $exts    = array();
+                $wp_exts = wp_get_ext_types();
 
                 if ( 'video' === $type ) {
                         $exts = wp_get_video_extensions();
@@ -689 +690 @@
                         'dismiss'                   => __( 'Dismiss', 'buddypress' ),
                         'crunching'                 => __( 'Crunching…', 'buddypress' ),
                         'unique_file_warning'       => __( 'Make sure to upload a unique file', 'buddypress' ),
+                        'noneditable_image'         => __( 'This image cannot be processed by the web server. Convert it to JPEG or PNG before uploading.', 'buddypress' ),
 
                         /* translators: %s: File name. */
                         'error_uploading'           => __( '“%s” has failed to upload.', 'buddypress' ),
@@ -779 +781 @@
                 $defaults['filters']['max_file_size'] = $args['max_file_size'] . 'b';
         }
 
+        if ( isset( $args['mime_types'] ) && $args['mime_types'] ) {
+                $defaults['filters']['mime_types'] =  array( array( 'extensions' => $args['mime_types'] ) );
+        }
+
+        // Check if WebP images can be edited.
+        if ( bp_is_running_wp( '5.8.0', '>=' ) && ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
+                $defaults['webp_upload_error'] = true;
+        }
+
         // Specific to BuddyPress Avatars.
         if ( 'bp_avatar_upload' === $defaults['multipart_params']['action'] ) {
 

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

@@ -399 +399 @@
                 // Get default script data.
                 $script_data = parent::script_data();
 
+                // Adds the list of supported image types.
+                $script_data['mime_types'] = implode( ',', bp_core_get_allowed_avatar_types() );
+
                 // Defaults to Avatar Backbone script.
                 $js_scripts = array( 'bp-avatar' );
 

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

@@ -196 +196 @@
                 // Get default script data.
                 $script_data = parent::script_data();
 
+                // Adds the list of supported image types.
+                $script_data['mime_types'] = implode( ',', bp_attachments_get_allowed_types( 'cover_image' ) );
+
                 if ( bp_is_user() ) {
                         $item_id = bp_displayed_user_id();
 

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

@@ -493 +493 @@
                         $check_types['dst_file'] = array( 'file' => $r['dst_file'], 'error' => _x( 'destination file', 'Attachment destination file', 'buddypress' ) );
                 }
 
-                /**
-                 * WordPress image supported types.
-                 * @see wp_attachment_is()
-                 */
-                $supported_image_types = array(
-                        'jpg'  => 1,
-                        'jpeg' => 1,
-                        'jpe'  => 1,
-                        'gif'  => 1,
-                        'png'  => 1,
-                );
+                // Set supported image types.
+                $supported_image_types = array_fill_keys( bp_attachments_get_allowed_types( 'image' ), 1 );
 
                 foreach ( $check_types as $file ) {
                         $is_image      = wp_check_filetype( $file['file'] );

src/bp-core/js/bp-plupload.js

@@ -162 +162 @@
                                         return;
                                 }
 
+                                if ( file.type === 'image/webp' && uploader.settings.webp_upload_error ) {
+                                        // Disallow uploading of WebP images if the server cannot edit them.
+                                        $( self ).trigger( 'bp-uploader-warning', self.strings.noneditable_image );
+                                        uploader.removeFile( file );
+                                        return;
+                                }
+
                                 if ( max > hundredmb && file.size > hundredmb && uploader.runtime !== 'html5' ) {
                                         _this.uploadSizeError( uploader, file, true );
                                 } else {

tests/phpunit/testcases/core/avatars.php

@@ -257 +257 @@
         public function test_bp_core_get_allowed_avatar_types_filter() {
                 add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
-                $this->assertEquals( array( 'jpeg', 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+                $this->assertEquals( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
                 add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
 
-                $this->assertEquals( array( 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+                $this->assertEquals( array( 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
 
                 add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
 
-                $this->assertEquals( array( 'jpeg', 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+                $this->assertEquals( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
         }
@@ -281 +281 @@
         public function test_bp_core_get_allowed_avatar_mimes() {
                 $mimes = bp_core_get_allowed_avatar_mimes();
 
-                $this->assertEqualSets( array( 'jpeg', 'gif', 'png', 'jpg' ), array_keys( $mimes ) );
-                $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( $mimes ) );
+                $this->assertEqualSets( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), array_keys( $mimes ) );
+                $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( $mimes ) );
 
                 add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
-                $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+                $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
                 add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
 
-                $this->assertEqualSets( array( 'image/gif', 'image/png' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+                $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
 
                 add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
 
-                $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+                $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
                 remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
         }

tests/phpunit/testcases/core/functions.php

@@ -784 +784 @@
          * @group bp_attachments
          */
         public function test_bp_attachments_get_allowed_types() {
-                $supported = array( 'jpeg', 'gif', 'png' );
+                $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
 
                 $avatar = bp_attachments_get_allowed_types( 'avatar' );
                 $this->assertSame( $supported, $avatar );