Ticket #19793: 19793.diff

src/wp-includes/media.php

@@ -503 +503 @@
         }
 
         // if the resulting image would be the same size or larger we don't want to resize it
-        if ( $new_w >= $orig_w && $new_h >= $orig_h )
+        if ( $new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h ) {
                 return false;
+        }
 
         // the return array matches the parameters to imagecopyresampled()
         // int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h

tests/phpunit/tests/image/dimensions.php

@@ -128 +128 @@
                 $this->assertEquals( array(0, 0, 0, 20, 400, 500, 480, 600), $out );
         }
 
+        function test_640x480() {
+                // crop 640x480 to fit 640x480 (no change)
+                $out = image_resize_dimensions(640, 480, 640, 480, true);
+                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+                $this->assertEquals( array(0, 0, 0, 0, 640, 480, 640, 480), $out );
+
+                // resize 640x480 to fit 640x480 (no change)
+                $out = image_resize_dimensions(640, 480, 640, 480, false);
+                // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+                $this->assertEquals( array(0, 0, 0, 0, 640, 480, 640, 480), $out );
+        }
+
         /**
          * @ticket 19393
          */