Ticket #15311: 15311.7.diff

src/wp-includes/media.php

@@ -581 +581 @@
  * @return bool|array False on failure or array of file path, width, and height on success.
  */
 function image_get_intermediate_size($post_id, $size='thumbnail') {
+        global $_wp_additional_image_sizes;
+
         if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
                 return false;
 
@@ -619 +621 @@
                 }
         }
 
-        if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
+        if ( is_array( $size ) || empty( $size ) ) {
                 return false;
+        }
 
+        /*
+         * If a file for requested image size isn't found in attachment metadata,
+         * but the size is registered, generate it on the fly.
+         */
+        if ( empty( $imagedata['sizes'][$size] ) && in_array( $size, get_intermediate_image_sizes() ) ) {
+                $upload_dir = wp_upload_dir();
+                $size_info = $_wp_additional_image_sizes[$size];
+                $large = image_get_intermediate_size( $post_id, 'large' );
+                /*
+                 * To save resources, crop from the large version of the image
+                 * if it is larger than the requested size.
+                 */
+                if ( $large && $large['width'] >= $size_info['width'] && $large['height'] >= $size_info['height'] ) {
+                        $file_to_crop_from = $upload_dir['basedir'] . "/{$large['path']}";
+                } else {
+                        $file_to_crop_from = get_attached_file( $post_id );
+                }
+                if ( $intermediate_size = image_make_intermediate_size( $file_to_crop_from, $size_info['width'], $size_info['height'], $size_info['crop'] ) ) {
+                        $imagedata['sizes'][$size] = $intermediate_size;
+                        wp_update_attachment_metadata( $post_id, $imagedata );
+                }
+        }
+
+        if ( empty( $imagedata['sizes'][$size]) ) {
+                return false;
+        }
+
         $data = $imagedata['sizes'][$size];
         // include the full filesystem path of the intermediate file
         if ( empty($data['path']) && !empty($data['file']) ) {

tests/phpunit/tests/post/attachments.php

@@ -278 +278 @@
                 $this->assertEquals( $attachment->post_parent, $post_id );
         }
 
+        /**
+         * Image generation on the fly should cut from the large image size when possible.
+         */
+        function test_generate_image_on_the_fly_with_large_size() {
+                if ( !function_exists( 'imagejpeg' ) )
+                        $this->markTestSkipped( 'jpeg support unavailable' );
+
+                $filename = ( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
+                $contents = file_get_contents( $filename );
+
+                $upload = wp_upload_bits( basename($filename), null, $contents );
+                $this->assertTrue( empty($upload['error']) );
+
+                $attachment_id = $this->_make_attachment( $upload );
+
+                // After the attachment has been created,
+                // add a new image size and request it.
+                add_image_size( 'medium-small', 400, 400, true );
+                $image = image_get_intermediate_size( $attachment_id, 'medium-small' );
+                $this->assertNotFalse( $image );
+                $this->assertEquals( $image['width'], 400 );
+                $this->assertEquals( $image['height'], 400 );
+        }
+
+        /**
+         * Image generation on the fly should cut from the large image size when possible,
+         * but if the large image is smaller than the requested size, use the original.
+         */
+        function test_generate_image_on_the_fly_with_original_size() {
+                if ( !function_exists( 'imagejpeg' ) )
+                        $this->markTestSkipped( 'jpeg support unavailable' );
+
+                // Make the "large" size too small to cut the `medium-small` size from,
+                // forcing the original to be used for cutting instead.
+                update_option( 'large_size_w', 100 );
+                update_option( 'large_size_h', 100 );
+
+                $filename = ( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
+                $contents = file_get_contents( $filename );
+
+                $upload = wp_upload_bits( basename($filename), null, $contents );
+                $this->assertTrue( empty($upload['error']) );
+
+                $attachment_id = $this->_make_attachment( $upload );
+
+                // After the attachment has been created,
+                // add a new image size and request it.
+                add_image_size( 'medium-small', 400, 400, true );
+                $image = image_get_intermediate_size( $attachment_id, 'medium-small' );
+                $this->assertNotFalse( $image );
+                $this->assertEquals( $image['width'], 400 );
+                $this->assertEquals( $image['height'], 400 );
+        }
 }