Changeset 59897

Timestamp:

03/02/2025 06:53:33 PM (3 months ago)

Author:

joedolson

Message:

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.

File:

• trunk/src/wp-admin/includes/image.php (modified) (1 diff)

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

@@ -340 +340 @@
                 $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();