Ticket #42775: 42775.diff

src/js/_enqueues/vendor/plupload/handlers.js

@@ -568 +568 @@
                         uploadStart();
 
                         plupload.each( files, function( file ) {
+
+                                if ( file.type === 'image/heic' && up.settings.heic_upload_error ) {
+                                        // Show error but do not block uploading.
+                                        wpQueueError( pluploadL10n.unsupported_image )
+                                }
+
                                 fileQueued( file );
                         });
 

src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -351 +351 @@
                                         return;
                                 }
 
+                                if ( file.type === 'image/heic' && up.settings.heic_upload_error ) {
+                                        // Show error but do not block uploading.
+                                        Uploader.errors.unshift({
+                                                message: pluploadL10n.unsupported_image,
+                                                data:    {},
+                                                file:    file
+                                        });
+                                }
+
                                 // Generate attributes for a new `Attachment` model.
                                 attributes = _.extend({
                                         file:      file,

src/wp-admin/includes/admin-filters.php

@@ -15 +15 @@
 
 // Media hooks.
 add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_filter( 'plupload_init', 'wp_show_heic_upload_error' );
 
 add_action( 'media_upload_image', 'wp_media_upload_handler' );
 add_action( 'media_upload_audio', 'wp_media_upload_handler' );

src/wp-includes/default-filters.php

@@ -534 +534 @@
 add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
 add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
 add_action( 'plugins_loaded', '_wp_add_additional_image_sizes', 0 );
+add_filter( 'plupload_default_settings', 'wp_show_heic_upload_error' );
 
 // Nav menu.
 add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );

src/wp-includes/functions.php

@@ -3046 +3046 @@
                         'bmp'                          => 'image/bmp',
                         'tiff|tif'                     => 'image/tiff',
                         'ico'                          => 'image/x-icon',
+                        'heic'                         => 'image/heic',
                         // Video formats.
                         'asf|asx'                      => 'video/x-ms-asf',
                         'wmv'                          => 'video/x-ms-wmv',

src/wp-includes/media.php

@@ -3592 +3592 @@
          *
          * @param array $params Default Plupload parameters array.
          */
-        $params                       = apply_filters( 'plupload_default_params', $params );
-        $params['_wpnonce']           = wp_create_nonce( 'media-form' );
+        $params = apply_filters( 'plupload_default_params', $params );
+
+        $params['_wpnonce'] = wp_create_nonce( 'media-form' );
+
         $defaults['multipart_params'] = $params;
 
         $settings = array(
@@ -4679 +4681 @@
         // 2x large size.
         add_image_size( '2048x2048', 2048, 2048 );
 }
+
+/**
+ * Callback to enable showig of the user error when uploading .heic images.
+ *
+ * @since 5.5.0
+ *
+ * @param array[] $plupload_settings The settings for Plupload.js.
+ * @return array[] Modified settings for Plupload.js.
+ */
+function wp_show_heic_upload_error( $plupload_settings ) {
+        $plupload_settings['heic_upload_error'] = true;
+        return $plupload_settings;
+}

src/wp-includes/script-loader.php

@@ -867 +867 @@
                 'deleted'                   => __( 'moved to the Trash.' ),
                 /* translators: %s: File name. */
                 'error_uploading'           => __( '“%s” has failed to upload.' ),
+                'unsupported_image'         => __( 'This image cannot be displayed in a web browser. For best results convert it to JPEG before uploading.' ),
         );
 
         $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );