Changeset 54094

Timestamp:

09/07/2022 03:39:28 PM (9 months ago)

Author:

flixos90

Message:

Media: Move wp_default_image_output_mapping() filter callback to frontend scope.

While the image_editor_output_format filter is primarily used in WP Admin, it can also be executed in frontend scope, as the related WP_Image_Editor class and wp_unique_filename() function are being loaded in that scope.

Follow up to [54086].

See #55443, #56526.

Location:

trunk/src

Files:

• wp-admin/includes/admin-filters.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

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

@@ -37 +37 @@
 
 add_filter( 'media_upload_tabs', 'update_gallery_tab' );
-
-add_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
 
 // Admin color schemes.

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

@@ -3844 +3844 @@
     }
 }
-
-/**
- * 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.
- * @retun array The adjusted default output mapping.
- */
-function wp_default_image_output_mapping( $output_mapping ) {
-    $output_mapping['image/jpeg'] = 'image/webp';
-    return $output_mapping;
-}

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

@@ -633 +633 @@
 add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
 
+add_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
 // Embeds.
 add_action( 'rest_api_init', 'wp_oembed_register_route' );

trunk/src/wp-includes/media.php

@@ -3906 +3906 @@
 
 /**
+ * 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.
+ * @retun array The adjusted default output mapping.
+ */
+function wp_default_image_output_mapping( $output_mapping ) {
+    $output_mapping['image/jpeg'] = 'image/webp';
+    return $output_mapping;
+}
+
+/**
  * Prints default Plupload arguments.
  *