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

Timestamp:

11/07/2019 06:49:17 PM (7 years ago)

Author:

azaozz

Message:

Upload: When an image was scaled because it is larger than the big image threshold, use the originally uploaded image's dimensions in wp_get_missing_image_subsizes(). Fixes an edge case/inconsistent behaviour when a registered image sub-size is also larger than the big image threshold.

Props desrosj, azaozz.
Fixes #48518 for trunk.

File:

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

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

@@ -91 +91 @@
         }
 
-        $full_width     = (int) $image_meta['width'];
-        $full_height    = (int) $image_meta['height'];
+        // Use the originally uploaded image dimensions as full_width and full_height.
+        if ( ! empty( $image_meta['original_image'] ) ) {
+                $image_file = wp_get_original_image_path( $attachment_id );
+                $imagesize  = @getimagesize( $image_file );
+        }
+
+        if ( ! empty( $imagesize ) ) {
+                $full_width  = $imagesize[0];
+                $full_height = $imagesize[1];
+        } else {
+                $full_width  = (int) $image_meta['width'];
+                $full_height = (int) $image_meta['height'];
+        }
+
         $possible_sizes = array();