Changeset 20706 for trunk/wp-admin/includes/image.php

Timestamp:

05/02/2012 09:35:56 PM (14 years ago)

Author:

ryan

Message:

Don't convert png to jpg when cropping a header. Prevents stomping transparency. Props SergeyBiryukov, kovshenin. fixes #20555

File:

• trunk/wp-admin/includes/image.php (modified) (4 diffs)

trunk/wp-admin/includes/image.php

@@ -45 +45 @@
  */
 function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+    if ( 0 == $src_x && 0 == $src_y && $src_w == $dst_w && $src_h == $dst_h )
+        return ( is_numeric( $src ) ) ? get_attached_file( $src ) : $src;
+
     if ( is_numeric( $src ) ) { // Handle int as attachment ID
         $src_file = get_attached_file( $src );
@@ -51 +54 @@
             // This can occur with certain file replication plugins.
             $post = get_post( $src );
+            $image_type = $post->post_mime_type;
             $src = load_image_to_edit( $src, $post->post_mime_type, 'full' );
         } else {
+            $size = @getimagesize( $src_file );
+            $image_type = ( $size ) ? $size['mime'] : '';
             $src = wp_load_image( $src_file );
         }
     } else {
+        $size = @getimagesize( $src );
+        $image_type = ( $size ) ? $size['mime'] : '';
         $src = wp_load_image( $src );
     }
@@ -79 +87 @@
         $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
 
-    $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
+    if ( 'image/png' != $image_type )
+        $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
 
     // The directory containing the original file may no longer exist when
@@ -85 +94 @@
     wp_mkdir_p( dirname( $dst_file ) );
 
-    if ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
+    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