Changeset 51227

Timestamp:

06/24/2021 07:10:32 PM (3 years ago)

Author:

azaozz

Message:

Media: Prevent uploading and show an error message when the server doesn't support editing of WebP images, take II. Add new, better error message for it.

Props antpb, joedolson, iandunn, azaozz.
Fixes #53475.

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/media.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -605 +605 @@
                 if ( file.type === 'image/heic' && up.settings.heic_upload_error ) {
                     // Show error but do not block uploading.
-                    wpQueueError( pluploadL10n.unsupported_image )
+                    wpQueueError( pluploadL10n.unsupported_image );
+                } else if ( file.type === 'image/webp' && up.settings.webp_upload_error ) {
+                    // Disallow uploading of WebP images if the server cannot edit them.
+                    wpQueueError( pluploadL10n.noneditable_image );
+                    up.removeFile( file );
+                    return;
                 }
 

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

@@ -359 +359 @@
                         file:    file
                     });
+                } else if ( file.type === 'image/webp' && up.settings.webp_upload_error ) {
+                    // Disallow uploading of WebP images if the server cannot edit them.
+                    error( pluploadL10n.noneditable_image, {}, file, 'no-retry' );
+                    up.removeFile( file );
+                    return;
                 }
 

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

@@ -2199 +2199 @@
     }
 
+    // Check if WebP images can be edited.
+    if ( ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
+        $plupload_init['webp_upload_error'] = true;
+    }
+
     /**
      * Filters the default Plupload settings.

trunk/src/wp-includes/media.php

@@ -3859 +3859 @@
     }
 
+    // Check if WebP images can be edited.
+    if ( ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
+        $defaults['webp_upload_error'] = true;
+    }
+
     /**
      * Filters the Plupload default settings.

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

@@ -876 +876 @@
         '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.' ),
+        'noneditable_image'         => __( 'This image cannot be processed by the web server. Convert it to JPEG or PNG before uploading.' ),
         'file_url_copied'           => __( 'The file URL has been copied to your clipboard' ),
     );