Changeset 54226 for trunk/src/wp-includes/class-wp-image-editor-imagick.php

Timestamp:

09/19/2022 10:51:53 PM (2 years ago)

Author:

davidbaumwald

Message:

Media: Revert WebP generation.

Given ​Matt's recent post about removing WebP from core and possibly implementing the feature in a future ​Canonical Plugin, this change reverts changesets [54086], [54094], and [54097]. Additionally, [54210] contained a coding standards follow-up in one of the affected files that is no longer needed.

Reverts [54086], [54094], and [54097].

Props SergeyBiryukov.
See #55443.

File:

• trunk/src/wp-includes/class-wp-image-editor-imagick.php (modified) (6 diffs)

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -439 +439 @@
      *
      * @param array $sizes {
-     *     Associative array of image size names and their data.
+     *     An array of image size data arrays.
      *
      *     Either a height or width must be provided.
@@ -459 +459 @@
 
         foreach ( $sizes as $size => $size_data ) {
-            // Include size name in the data.
-            $size_data['name'] = $size;
-
             $meta = $this->make_subsize( $size_data );
 
@@ -476 +473 @@
      *
      * @since 5.3.0
-     * @since 6.1.0 The $sizes parameter may now include a $name key for each entry.
      *
      * @param array $size_data {
      *     Array of size data.
      *
-     *     @type int    $width  The maximum width in pixels.
-     *     @type int    $height The maximum height in pixels.
-     *     @type bool   $crop   Whether to crop the image to exact dimensions.
-     *     @type string $name   Image size name.
+     *     @type int  $width  The maximum width in pixels.
+     *     @type int  $height The maximum height in pixels.
+     *     @type bool $crop   Whether to crop the image to exact dimensions.
      * }
      * @return array|WP_Error The image data array for inclusion in the `sizes` array in the image meta,
@@ -494 +489 @@
         }
 
-        $orig_size      = $this->size;
-        $orig_size_name = $this->size_name;
-        $orig_image     = $this->image->getImage();
+        $orig_size  = $this->size;
+        $orig_image = $this->image->getImage();
 
         if ( ! isset( $size_data['width'] ) ) {
@@ -508 +502 @@
         if ( ! isset( $size_data['crop'] ) ) {
             $size_data['crop'] = false;
-        }
-
-        if ( isset( $size_data['name'] ) ) {
-            $this->update_size_name( $size_data['name'] );
         }
 
@@ -526 +516 @@
         }
 
-        $this->size      = $orig_size;
-        $this->size_name = $orig_size_name;
-        $this->image     = $orig_image;
+        $this->size  = $orig_size;
+        $this->image = $orig_image;
 
         if ( ! is_wp_error( $saved ) ) {