Changeset 54226 for trunk/src/wp-includes/media.php

Timestamp:

09/19/2022 10:51:53 PM (3 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/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -3928 +3928 @@
 
 /**
- * Filters the default image output mapping.
- *
- * With this filter callback, WebP image files will be generated for certain JPEG source files.
- *
- * @since 6.1.0
- *
- * @param array $output_mapping Map of mime type to output format.
- * @param string $filename  Path to the image.
- * @param string $mime_type The source image mime type.
- * @param string $size_name Optional. The image size name to create, or empty string if not set. Default empty string.
- * @return array The adjusted default output mapping.
- */
-function wp_default_image_output_mapping( $output_mapping, $filename, $mime_type, $size_name = '' ) {
-    // If size name is specified, check whether the size supports additional MIME types like WebP.
-    if ( $size_name ) {
-        // Include only the core sizes that do not rely on add_image_size(). Additional image sizes are opt-in.
-        $enabled_sizes = array(
-            'thumbnail'      => true,
-            'medium'         => true,
-            'medium_large'   => true,
-            'large'          => true,
-            'post-thumbnail' => true,
-        );
-
-        /**
-         * Filters the sizes that support secondary mime type output. Developers can use this
-         * to control the generation of additional mime type sub-sized images.
-         *
-         * @since 6.1.0
-         *
-         * @param array $enabled_sizes Map of size names and whether they support secondary mime type output.
-         */
-        $enabled_sizes = apply_filters( 'wp_image_sizes_with_additional_mime_type_support', $enabled_sizes );
-
-        // Bail early if the size does not support additional MIME types.
-        if ( empty( $enabled_sizes[ $size_name ] ) ) {
-            return $output_mapping;
-        }
-    }
-
-    $output_mapping['image/jpeg'] = 'image/webp';
-    return $output_mapping;
-}
-
-/**
  * Prints default Plupload arguments.
  *