Ticket #16458: 16458.diff

wp-includes/media.php

@@ -442 +442 @@
         if ( !is_null($dest_path) and $_dest_path = realpath($dest_path) )
                 $dir = $_dest_path;
         $destfilename = "{$dir}/{$name}-{$suffix}.{$ext}";
+        
+        // If the file already exists, add a numeric suffix and increment it until
+        // the new file name is available
+        if ( file_exists($destfilename) ) {
+                $i = 1;
+                do {
+                        $destfilename = "{$dir}/{$name}{$i}-{$suffix}.{$ext}";
+                        $i++;
+                } while ( file_exists($destfilename) );
+        }
 
         if ( IMAGETYPE_GIF == $orig_type ) {
                 if ( !imagegif( $newimage, $destfilename ) )
@@ -451 +461 @@
                         return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
         } else {
                 // all other formats are converted to jpg
-                $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
+                $destfilename = substr($destfilename, 0, 0 - strlen($ext)) . 'jpg';
                 if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
                         return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
         }