HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Media: Simplify file name generation for image conversions.

Browse Source 
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
This commit is contained in:
joedolson
2025-03-02 18:55:23 +00:00
parent 01c10003eb
commit 5961453fc3
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/includes/image.php
View File

@@ -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();
}

2
wp-includes/version.php
View File

@@ -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.