Ticket #8643: 8643.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' );
+        $exts    = array( 'jpeg', 'gif', 'png', 'webp' );
         $wp_exts = wp_get_ext_types();
 
         /**
@@ -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 ( ! 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'] = $this->get_supported_image_types( 'csv' );
+
                 // 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'] = $this->get_supported_image_types( 'csv' );
+
                 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 = $this->get_supported_image_types();
 
                 foreach ( $check_types as $file ) {
                         $is_image      = wp_check_filetype( $file['file'] );
@@ -536 +527 @@
                 return wp_crop_image( $r['original_file'], (int) $r['crop_x'], (int) $r['crop_y'], (int) $r['crop_w'], (int) $r['crop_h'], (int) $r['dst_w'], (int) $r['dst_h'], $r['src_abs'], $r['dst_file'] );
         }
 
+        /**
+         * Returns the list of supported image types.
+         *
+         * @since 11.0.0
+         *
+         * @param string $return The format to use to return the supported image types.
+         *                       Possible values are 'array' for an array keyed by image types
+         *                       or 'csv' for a comma separated list of image types.
+         * @return array|string  The list of supported image types.
+         */
+        public function get_supported_image_types( $return = 'array' ) {
+                /**
+                 * WordPress image supported types.
+                 * @see wp_attachment_is()
+                 */
+                $supported_types = array(
+                        'jpg'  => 1,
+                        'jpeg' => 1,
+                        'jpe'  => 1,
+                        'gif'  => 1,
+                        'png'  => 1,
+                        'webp' => 1,
+                );
+
+                if ( 'csv' === $return ) {
+                        return implode( ',', array_keys( $supported_types ) );
+                }
+
+                return $supported_types;
+        }
+
         /**
          * Build script datas for the Uploader UI.
          *

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 {