Ticket #50866: 50866.2.diff

src/wp-includes/media.php

@@ -775 +775 @@
                 }
 
                 foreach ( $imagedata['sizes'] as $_size => $data ) {
+                        // If the original image matches the required size, use it instead of a generated size and short circuit.
+                        if ( (int) $imagedata['width'] === (int) $size[0] && (int) $imagedata['height'] === (int) $size[1] ) {
+                                $candidates[ $data['width'] * $data['height'] ] = array(
+                                                'width'  => $imagedata['width'],
+                                                'height' => $imagedata['height'],
+                                                'file'   => wp_basename( $imagedata['file'] ),
+                                );
+                                break;
+                        }
+
                         // If there's an exact match to an existing image size, short circuit.
                         if ( (int) $data['width'] === (int) $size[0] && (int) $data['height'] === (int) $size[1] ) {
                                 $candidates[ $data['width'] * $data['height'] ] = $data;
@@ -817 +827 @@
                 // Constrain the width and height attributes to the requested values.
                 list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
 
+        } elseif ( (int) $imagedata['width'] === $imagedata['sizes'][ $size ]['width'] && (int) $imagedata['height'] === $imagedata['sizes'][ $size ]['height'] ) {
+                $data = array(
+                                'width'  => $imagedata['width'],
+                                'height' => $imagedata['height'],
+                                'file'   => wp_basename( $imagedata['file'] ),
+                );
         } elseif ( ! empty( $imagedata['sizes'][ $size ] ) ) {
                 $data = $imagedata['sizes'][ $size ];
         }

tests/phpunit/tests/image/intermediateSize.php

@@ -15 +15 @@
                 parent::tear_down();
         }
 
-        public function _make_attachment( $file, $parent_post_id = 0 ) {
+        public function _make_attachment( $file = '', $parent_post_id = 0 ) {
                 $contents = file_get_contents( $file );
                 $upload   = wp_upload_bits( wp_basename( $file ), null, $contents );
 
@@ -88 +88 @@
                 }
         }
 
+        /**
+         * @ticket 50866
+         * @ticket 47713
+         */
+        function test_get_intermediate_size_with_same_as_original_size() {
+                add_image_size( 'test-size', 100, 200, true );
+
+                $file = DIR_TESTDATA . '/images/test_100x200.png';
+                $id   = $this->_make_attachment( $file, 0 );
+
+                // Look for a size by name.
+                $image = image_get_intermediate_size( $id, 'test-size' );
+
+                // Test that WordPress returns the original image path and not an intermediate size
+                $this->assertSame(
+                        $image['file'],
+                        'test_100x200.png',
+                        'did not return original before removing image size'
+                );
+
+                $image = image_get_intermediate_size( $id, [100, 200] );
+
+                // Cleanup.
+                remove_image_size( 'test-size' );
+
+                // Test that WordPress returns the original image path and not an intermediate size
+                $this->assertSame(
+                        $image['file'],
+                        'test_100x200.png',
+                        'did not return original after removing image size'
+                );
+        }
+
         /**
          * @ticket 17626
          * @requires function imagejpeg