Ticket #21668: 21668.2.patch

wp-admin/includes/image-edit.php

@@ -223 +223 @@
 
         switch ( $mime_type ) {
                 case 'image/jpeg':
+                        if ( function_exists( 'imageinterlace' ) )
+                                imageinterlace( $image, 1 );
                         return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
                 case 'image/png':
                         return imagepng($image, $filename);

wp-admin/includes/image.php

@@ -92 +92 @@
 
         $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
-        if ( 'image/png' == $image_type && imagepng( $dst, $dst_file ) )
+        if ( 'image/png' == $image_type && imagepng( $dst, $dst_file ) ) {
                 return $dst_file;
-        elseif ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
-                return $dst_file;
-        else
-                return false;
+        } else {
+                if ( function_exists( 'imageinterlace' ) )
+                        imageinterlace( $dst, 1 );
+                if ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
+                        return $dst_file;
+        }
+
+        return false;
 }
 
 /**

wp-includes/media.php

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