Changeset 58571 for trunk/src/wp-admin/includes/image-edit.php

Timestamp:

06/25/2024 03:30:57 PM (9 months ago)

Author:

jorbin

Message:

Media: unfix admin image cropping calculations.

[58456] introduced some failures to the automated test system that indicate this fix is incomplete.

See #32282.
Props hellofromtonya, audrasjb, andrewserong, kevin940726, oglekler.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image-edit.php (modified) (1 diff)

trunk/src/wp-admin/includes/image-edit.php

@@ -736 +736 @@
                     $h    = $size['height'];
 
-                    $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
+                    $scale = 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
                     $image->crop( (int) ( $sel->x * $scale ), (int) ( $sel->y * $scale ), (int) ( $sel->w * $scale ), (int) ( $sel->h * $scale ) );
                 } else {
-                    $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.
+                    $scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.
                     $image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
                 }