WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor-gd.php

diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index ddba1ff8bb5e47329f0e2e0de3644e67a93b72e3..371552c28c14b468b2475af0be8f19477e6a33dc 100644 (file)
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -231,8 +231,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
                        }
 
                        $image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
+                       $duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
 
-                       if( ! is_wp_error( $image ) ) {
+                       if ( ! is_wp_error( $image ) && ! $duplicate ) {
                                $resized = $this->_save( $image );
 
                                imagedestroy( $image );
@@ -306,9 +307,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         */
        public function rotate( $angle ) {
                if ( function_exists('imagerotate') ) {
-                       $rotated = imagerotate( $this->image, $angle, 0 );
+                       $transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
+                       $rotated = imagerotate( $this->image, $angle, $transparency );
 
                        if ( is_resource( $rotated ) ) {
+                               imagealphablending( $rotated, true );
+                               imagesavealpha( $rotated, true );
                                imagedestroy( $this->image );
                                $this->image = $rotated;
                                $this->update_size();