Ticket #41816: 41816.diff

src/wp-includes/media.php

@@ -3922 +3922 @@
                 $path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
         }
 
-        $sql = $wpdb->prepare(
-                "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
-                $path
-        );
+        $mime_type = wp_check_filetype( $path );
+        $is_image = 0 === strpos( $mime_type['type'], 'image/' );
+
+        if ( $is_image ) {
+                $sql = $wpdb->prepare(
+                        "SELECT pm.post_id
+                         FROM $wpdb->postmeta as pm INNER JOIN $wpdb->posts as p ON ( pm.post_id = p.ID )
+                         WHERE p.post_type = 'attachment' AND p.post_status = 'inherit' AND
+                                pm.meta_key = '_wp_attachment_metadata' AND     meta_value LIKE %s",
+                        '%' . basename( $path ) . '%'
+                );
+        }
+        else {
+                $sql = $wpdb->prepare(
+                        "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
+                        $path
+                );
+        }
+
         $post_id = $wpdb->get_var( $sql );
 
+        if ( $post_id && $is_image ) {
+                $meta = wp_get_attachment_metadata( $post_id );
+                if ( isset( $meta['file'], $meta['sizes'] ) ) {
+                        $path = basename( $path );
+
+                        $original_file = basename( $meta['file'] );
+                        $cropped_image_files = wp_list_pluck( $meta['sizes'], 'file' );
+
+                        if ( ! ( $original_file === $path || in_array( $path, $cropped_image_files ) ) ) {
+                                $post_id = null;
+                        }
+                }
+        }
+
         /**
          * Filters an attachment id found by URL.
          *