From c5bf14f31baff274b95cd7b2c1e67fc96f138592 Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Sun, 10 Nov 2024 21:41:13 +0000
Subject: [PATCH] Media: Remove dimension suffix from full size converted HEIC
 images.

Removes the dimension suffix, eg `-1000x1000` from the file name of full size images automatically converted from HEIC to JPEGs by WordPress. Introduces unit tests for the default conversion of images and customized conversion settings via the `image_editor_output_format` filter.

Follow up to [58849], [58942], [59317], [59346], [59366]

Props mukesh27, peterwilsoncc, azaozz, apermo, flixos90, ironprogrammer.
Fixes #62359.
See #53645, #62305.



Built from https://develop.svn.wordpress.org/trunk@59379


git-svn-id: http://core.svn.wordpress.org/trunk@58765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/image.php | 12 ++++++++++++
 wp-includes/version.php     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 2e79578e23..8471c999c8 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -341,6 +341,18 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
 				 */
 				if ( $scale_down ) {
 					$saved = $editor->save( $editor->generate_filename( 'scaled' ) );
+				} elseif ( $convert ) {
+					/*
+					 * Generate a new file name for the converted image.
+					 *
+					 * As the image file name will be unique due to the changed file extension,
+					 * it does not need a suffix to be unique. However, the generate_filename method
+					 * does not allow for an empty suffix, so the "-converted" suffix is required to
+					 * be added and subsequently removed.
+					 */
+					$converted_file_name = $editor->generate_filename( 'converted' );
+					$converted_file_name = preg_replace( '/(-converted\.)([a-z0-9]+)$/i', '.$2', $converted_file_name );
+					$saved               = $editor->save( $converted_file_name );
 				} else {
 					$saved = $editor->save();
 				}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4446a99341..b46ab1cc75 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59378';
+$wp_version = '6.8-alpha-59379';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.