Ticket #37840: 37840.2.diff

src/wp-admin/includes/image.php

@@ -105 +105 @@
                                 $sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
                         } else {
                                 // For default sizes set in options
-                                $sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
+                                $sizes[ $s ]['width'] = get_option( "{$s}_size_w", $metadata['width'] );
                         }
 
                         if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
@@ -113 +113 @@
                                 $sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
                         } else {
                                 // For default sizes set in options
-                                $sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
+                                $sizes[ $s ]['height'] = get_option( "{$s}_size_h", $metadata['height'] );
                         }
 
                         if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
@@ -121 +121 @@
                                 $sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
                         } else {
                                 // For default sizes set in options
-                                $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
+                                $sizes[ $s ]['crop'] = get_option( "{$s}_crop", false );
                         }
                 }
 

src/wp-includes/class-wp-image-editor-gd.php

@@ -109 +109 @@
                         imagesavealpha( $this->image, true );
                 }
 
+                $this->filesize = @filesize( $this->file );
                 $this->update_size( $size[0], $size[1] );
                 $this->mime_type = $size['mime'];
 
@@ -239 +240 @@
                         $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 ( 'full' == $size ) {
+                                if ( true === $this->can_save_optimised_full_size() ) {
+                                        $duplicate = false;
+                                }
+                        }
+
                         if ( ! is_wp_error( $image ) && ! $duplicate ) {
                                 $resized = $this->_save( $image );
 

src/wp-includes/class-wp-image-editor-imagick.php

@@ -168 +168 @@
                         return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
                 }
 
+                $this->filesize = @filesize( $this->file );
                 $updated_size = $this->update_size();
                 if ( is_wp_error( $updated_size ) ) {
                         return $updated_size;
@@ -457 +458 @@
                         $resize_result = $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 ( 'full' == $size ) {
+                                if ( true === $this->can_save_optimised_full_size() ) {
+                                        $duplicate = false;
+                                }
+                        }
+
                         if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
                                 $resized = $this->_save( $this->image );
 

src/wp-includes/class-wp-image-editor.php

@@ -18 +18 @@
         protected $default_mime_type = 'image/jpeg';
         protected $quality           = false;
         protected $default_quality   = 82;
+        protected $filesize = null;
+        protected $minimum_filesize_difference = false;
+        protected $default_minimum_filesize_difference = 15;
+
 
         /**
          * Each instance handles a single file.
@@ -466 +470 @@
 
                 return $extensions[0];
         }
+
+        /**
+         * Gets minimum filesize difference for compressed full size images.
+         *
+         * @since 4.8.0
+         * @access public
+         *
+         * @return int $minimum_filesize_difference Minimum filesize difference. Range [0-100]
+         */
+        public function get_minimum_filesize_difference() {
+                if ( ! $this->minimum_filesize_difference ) {
+                        $this->set_minimum_filesize_difference();
+                }
+
+                return $this->minimum_filesize_difference;
+        }
+
+        /**
+         * Sets minimum filesize difference for compressed full images, 0-100% scale.
+         *
+         * @since 4.8.0
+         * @access public
+         *
+         * @param int $minimum_filesize_difference Minimum filesize difference. Range [0-100]
+         * @return true|WP_Error True if set successfully; WP_Error on failure.
+         */
+        public function set_minimum_filesize_difference( $minimum_filesize_difference = null ) {
+                if ( null === $minimum_filesize_difference ) {
+                        /**
+                         * Filters the default minimum filesize difference. Range [0-100]
+                         *
+                         * Applies only during initial editor instantiation, or when set_minimum_filesize_difference() is run
+                         * manually without the `$minimum_filesize_difference` argument.
+                         *
+                         * set_minimum_filesize_difference() has priority over the filter.
+                         *
+                         * @since 4.8.0
+                         *
+                         * @param int $default_minimum_filesize_difference Minimum filesize difference. Range [0-100]
+                         * @param string $mime_type Image mime type.
+                         */
+                        $minimum_filesize_difference = apply_filters( 'wp_image_set_minimum_filesize_difference', $this->default_minimum_filesize_difference, $this->mime_type );
+
+
+                        if ( $minimum_filesize_difference < 0 || $minimum_filesize_difference > 100 ) {
+                                $minimum_filesize_difference = $this->default_minimum_filesize_difference;
+                        }
+                }
+
+                if ( ( $minimum_filesize_difference >= 0 ) && ( $minimum_filesize_difference <= 100 ) ) {
+                        $this->minimum_filesize_difference = $minimum_filesize_difference;
+                        return true;
+                } else {
+                        return new WP_Error( 'invalid_filesize_difference', __('Attempted to set filesize difference outside of the range [1,100].') );
+                }
+        }
+
+        /**
+         * Should we save the optimised version of the 'full' image?
+         *
+         * If we're optimising the 'full' image size then we need to compare image sizes.
+         * If the percentage of the image size decrease is greater than our set value
+         * then we should store the image.
+         *
+         * See trac ticket #37840
+         *
+         * @since 4.8.0
+         * @access protected
+         *
+         * @return bool True if we should save the image, otherwise False.
+         */
+        protected function can_save_optimised_full_size() {
+                ob_start();
+                $this->stream();
+                $optimised_size = ob_get_length();
+                ob_end_clean();
+
+                // Make sure we've got numbers to calculate with
+                if( is_numeric( $optimised_size ) && is_numeric( $this->filesize ) ) {
+                        $perc_decrease = ( ( $optimised_size - $this->filesize ) / ( $this->filesize * - 1 ) ) * 100;
+
+                        if ( $this->get_minimum_filesize_difference() <= $perc_decrease ) {
+                                return true;
+                        }
+                }
+
+                return false;
+        }
 }
 

src/wp-includes/media.php

@@ -787 +787 @@
  */
 function get_intermediate_image_sizes() {
         $_wp_additional_image_sizes = wp_get_additional_image_sizes();
-        $image_sizes                = array( 'thumbnail', 'medium', 'medium_large', 'large' ); // Standard sizes
+        $image_sizes                = array( 'thumbnail', 'medium', 'medium_large', 'large', 'full' ); // Standard sizes
         if ( ! empty( $_wp_additional_image_sizes ) ) {
                 $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
         }
@@ -798 +798 @@
          * @since 2.5.0
          *
          * @param array $image_sizes An array of intermediate image sizes. Defaults
-         *                           are 'thumbnail', 'medium', 'medium_large', 'large'.
+         *                           are 'thumbnail', 'medium', 'medium_large', 'large', 'full'.
          */
         return apply_filters( 'intermediate_image_sizes', $image_sizes );
 }