Changeset 59855

Timestamp:

02/21/2025 08:23:34 PM (3 months ago)

Author:

joedolson

Message:

Media: Support generating filenames without a suffix.

Add support handling an empty string in the $suffix parameter that allows a file name to be generated with no suffix added. This makes it possible to avoid adding irrelevant suffixes in cases like converting image formats.

Props azaozz, debarghyabanerjee, joedolson.
See #62359.
Fixes #62385.

File:

• trunk/src/wp-includes/class-wp-image-editor.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-image-editor.php

@@ -434 +434 @@
      *
      * @since 3.5.0
+     * @since 6.8.0 Passing an empty string as $suffix will now omit the suffix from the generated filename.
      *
      * @param string $suffix
@@ -441 +442 @@
      */
     public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
-        // $suffix will be appended to the destination filename, just before the extension.
-        if ( ! $suffix ) {
-            $suffix = $this->get_suffix();
+        // If not empty the $suffix will be appended to the destination filename, just before the extension.
+        if ( $suffix ) {
+            $suffix = '-' . $suffix;
+        } elseif ( '' !== $suffix ) {
+            $suffix = '-' . $this->get_suffix();
         }
 
@@ -463 +466 @@
         }
 
-        return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
+        return trailingslashit( $dir ) . "{$name}{$suffix}.{$new_ext}";
     }