Ticket #20657: 20657.2.patch

wp-admin/custom-header.php

@@ -872 +872 @@
                         wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
                 $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
+                $is_cropped = ( get_attached_file( $attachment_id ) != $cropped );
 
                 $parent = get_post($attachment_id);
                 $parent_url = $parent->guid;
@@ -909 +910 @@
                 set_theme_mod( 'header_image_data', $header_data );
 
                 // cleanup
-                $medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+                $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
                 if ( file_exists( $medium ) )
                         @unlink( apply_filters( 'wp_delete_file', $medium ) );
-                if ( empty ( $_POST['new-attachment'] ) )
+                if ( empty( $_POST['new-attachment'] ) && $is_cropped )
                         @unlink( apply_filters( 'wp_delete_file', $original ) );
 
                 return $this->finished();