Changeset 48288

Timestamp:

07/03/2020 11:13:30 PM (4 years ago)

Author:

azaozz

Message:

Media: Show an error message when a .heic file is uploaded that this type of files cannot be displayed in a web browser and suggesting to convert to JPEG. The message is shown by using filters, plugins that want to handle uploading of .heic files can remove it.

Props mattheweppelsheimer, mikeschroder, jeffr0, andraganescu, desrosj, azaozz.
Fixes #42775.

Location:

trunk/src

Files:

• js/_enqueues/vendor/plupload/handlers.js (modified) (1 diff)
• js/_enqueues/vendor/plupload/wp-plupload.js (modified) (1 diff)
• wp-admin/includes/admin-filters.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -569 +569 @@
 
             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 );
             });

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

@@ -352 +352 @@
                 }
 
+                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({

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

@@ -16 +16 @@
 // 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' );

trunk/src/wp-includes/default-filters.php

@@ -535 +535 @@
 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.

trunk/src/wp-includes/functions.php

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

trunk/src/wp-includes/media.php

@@ -3600 +3600 @@
      * @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;
 
@@ -4687 +4689 @@
     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;
+}

trunk/src/wp-includes/script-loader.php

@@ -847 +847 @@
         /* 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.' ),
     );