vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Media: Bail early if image is already the requested size.

Browse Source 
In `WP_Image_Editor_Imagick`, bail early in `make_subsize()` if the image is already the requested size. Previously, `make_subsize()` would create another copy of the file. `WP_Image_Editor_GD` doesn't have the same problem.

Props wojtekn, danielbachhuber.
Fixes #57370.


git-svn-id: https://develop.svn.wordpress.org/trunk@55278 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Daniel Bachhuber 2023-02-07 17:22:41 +00:00
parent 0821c7ad30
commit d80c313c80
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/class-wp-image-editor-imagick.php
View File

@ -503,6 +503,10 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
$size_data['crop'] = false;
}
if ( ( $this->size['width'] == $size_data['width'] ) && ( $this->size['height'] == $size_data['height'] ) ) {
return new WP_Error( 'image_subsize_create_error', __( 'The image already has the requested size.' ) );
}
$resized = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
if ( is_wp_error( $resized ) ) {

34
tests/phpunit/tests/media.php
View File

@ -3770,6 +3770,40 @@ EOF;
}
}
/**
* Test that an image size isn't generated if it matches the original image size.
*/
public function test_wp_generate_attachment_metadata_doesnt_generate_sizes_for_150_square_image() {
$temp_dir = get_temp_dir();
$file = $temp_dir . '/test-square-150.jpg';
copy( DIR_TESTDATA . '/images/test-square-150.jpg', $file );
$attachment_id = self::factory()->attachment->create_object(
array(
'post_mime_type' => 'image/jpeg',
'file' => $file,
)
);
$metadata = wp_generate_attachment_metadata( $attachment_id, $file );
$this->assertEquals(
array(),
$metadata['sizes']
);
$this->assertEquals(
'test-square-150.jpg',
basename( $metadata['file'] )
);
$this->assertEquals(
'150',
$metadata['width']
);
$this->assertEquals(
'150',
$metadata['height']
);
}
/**
* Add threshold to create a `-scaled` output image for testing.
*/