Changeset 48454 for trunk/src/wp-includes/media.php

Timestamp:

07/12/2020 09:18:38 PM (4 years ago)

Author:

azaozz

Message:

Media: Fix wp_image_file_matches_image_meta() to also match when the original image URL is used.

Also refreshes and fixes some of the unit tests for media, and replaces test-image-large.png with test-image-large.jpg which is larger to allow testing of original_image in the image meta.

Fixes #50628.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -1523 +1523 @@
         if ( strrpos( $image_location, $image_meta['file'] ) === strlen( $image_location ) - strlen( $image_meta['file'] ) ) {
             $match = true;
-        } elseif ( ! empty( $image_meta['sizes'] ) ) {
+        } else {
             // Retrieve the uploads sub-directory from the full size image.
             $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
@@ -1531 +1531 @@
             }
 
-            foreach ( $image_meta['sizes'] as $image_size_data ) {
-                $relative_path = $dirname . $image_size_data['file'];
+            if ( ! empty( $image_meta['original_image'] ) ) {
+                $relative_path = $dirname . $image_meta['original_image'];
 
                 if ( strrpos( $image_location, $relative_path ) === strlen( $image_location ) - strlen( $relative_path ) ) {
                     $match = true;
-                    break;
+                }
+            }
+
+            if ( ! $match && ! empty( $image_meta['sizes'] ) ) {
+                foreach ( $image_meta['sizes'] as $image_size_data ) {
+                    $relative_path = $dirname . $image_size_data['file'];
+
+                    if ( strrpos( $image_location, $relative_path ) === strlen( $image_location ) - strlen( $relative_path ) ) {
+                        $match = true;
+                        break;
+                    }
                 }
             }