Changeset 40130 for trunk/src/wp-admin/includes/image.php

Timestamp:

02/27/2017 03:38:30 PM (8 years ago)

Author:

joemcgill

Message:

Media: Keep PDF previews from overwriting files.

Since support for PDF previews were added in [38949], it's possible
that the generated image file could overwrite an existing image file
with the same name. This uses wp_unique_filename() to avoid this
issue and adds a '-pdf' identifier on the end of filenames.

Props gitlost, derosj, mikeschroder, joemcgill.
Fixes #39875. See #31050.

File:

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

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

@@ -252 +252 @@
 
             if ( ! is_wp_error( $editor ) ) { // No support for this type of file
-                $uploaded = $editor->save( $file, 'image/jpeg' );
+                /*
+                 * PDFs may have the same file filename as JPEGs.
+                 * Ensure the PDF preview image does not overwrite any JPEG images that already exist.
+                 */
+                $dirname = dirname( $file ) . '/';
+                $ext = '.' . pathinfo( $file, PATHINFO_EXTENSION );
+                $preview_file = $dirname . wp_unique_filename( $dirname, wp_basename( $file, $ext ) . '-pdf.jpg' );
+
+                $uploaded = $editor->save( $preview_file, 'image/jpeg' );
                 unset( $editor );