Changeset 20701

Timestamp:

05/02/2012 08:58:57 PM (14 years ago)

Author:

nacin

Message:

In image_resize(), do not force the destination filename to *.jpg when we are dealing with a *.jpeg.

props SergeyBiryukov.
fixes #16458.

File:

• trunk/wp-includes/media.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -463 +463 @@
         } else {
                 // all other formats are converted to jpg
-                $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
+                if ( 'jpg' != $ext && 'jpeg' != $ext )
+                        $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
                 if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
                         return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));