From 5961453fc3ee94c75fa69335ae0f3d5f9164e6de Mon Sep 17 00:00:00 2001
From: joedolson <joedolson@git.wordpress.org>
Date: Sun, 2 Mar 2025 18:55:23 +0000
Subject: [PATCH] Media: Simplify file name generation for image conversions.

Use the empty string argument in `$editor->save()` added in [59855] to simplify the code used to prevent image format conversions from getting a suffix appended to their file names.

Props joedolson, audrasjb, azaozz.
See #62385.
Fixes #63003.
Built from https://develop.svn.wordpress.org/trunk@59897


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

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index bb70b27787..9fe2471669 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -339,17 +339,8 @@ 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 );
+				// Pass an empty string to avoid adding a suffix to converted file names.
+				$saved = $editor->save( $editor->generate_filename( '' ) );
 			} else {
 				$saved = $editor->save();
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0d0b0d9a1c..da697fc7c0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59896';
+$wp_version = '6.8-alpha-59897';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.