WordPress 4.0

[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 303f5004c0d96813aff91b92694ca2dea3cee0ea..ef804571c6a6191969b65afb2316bc69ebdc9eac 100644 (file)
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -18,7 +18,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 
        protected $image = false; // GD Resource
 
 
        protected $image = false; // GD Resource
 

-       function __destruct() {
+       public function __destruct() {

                if ( $this->image ) {
                        // we don't need the original in memory anymore
                        imagedestroy( $this->image );
                if ( $this->image ) {
                        // we don't need the original in memory anymore
                        imagedestroy( $this->image );


@@ -114,7 +114,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
                $this->update_size( $size[0], $size[1] );
                $this->mime_type = $size['mime'];
 
                $this->update_size( $size[0], $size[1] );
                $this->mime_type = $size['mime'];
 

-               return $this->set_quality( $this->quality );
+               return true;

        }
 
        /**
        }
 
        /**


@@ -387,7 +387,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
                                return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                }
                elseif ( 'image/jpeg' == $mime_type ) {
                                return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                }
                elseif ( 'image/jpeg' == $mime_type ) {

-                       if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) )
+                       if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )

                                return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                }
                else {
                                return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                }
                else {


@@ -435,7 +435,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
                                return imagegif( $this->image );
                        default:
                                header( 'Content-Type: image/jpeg' );
                                return imagegif( $this->image );
                        default:
                                header( 'Content-Type: image/jpeg' );

-                               return imagejpeg( $this->image, null, $this->quality );
+                               return imagejpeg( $this->image, null, $this->get_quality() );

                }
        }
 
                }
        }