Changeset 48547

Timestamp:

07/21/2020 04:52:48 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Media: Pass the attachment ID to the wp_image_file_matches_image_meta filter.

Props spacedmonkey.
Fixes #50722.

Location:

trunk/src/wp-includes

Files:

• media.php (modified) (5 diffs)
• rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -1508 +1508 @@
  * @since 5.5.0
  *
- * @param string $image_location  The full path or URI to the image file.
- * @param array  $image_meta      The attachment meta data as returned by 'wp_get_attachment_metadata()'.
+ * @param string $image_location The full path or URI to the image file.
+ * @param array  $image_meta     The attachment meta data as returned by 'wp_get_attachment_metadata()'.
+ * @param int    $attachment_id  Optional. The image attachment ID. Default 0.
  * @return bool Whether the image meta is for this image file.
  */
-function wp_image_file_matches_image_meta( $image_location, $image_meta ) {
+function wp_image_file_matches_image_meta( $image_location, $image_meta, $attachment_id = 0 ) {
     $match = false;
 
@@ -1560 +1561 @@
      *                               matches the end of the URI or path to the image file.
      * @param string $image_location Full path or URI to the tested image file.
-     * @param array  $image_meta     The image meta data being tested.
-     */
-    return apply_filters( 'wp_image_file_matches_image_meta', $match, $image_location, $image_meta );
+     * @param array  $image_meta     The image meta data as returned by 'wp_get_attachment_metadata()'.
+     * @param int    $attachment_id  The image attachment ID or 0 if not supplied.
+     */
+    return apply_filters( 'wp_image_file_matches_image_meta', $match, $image_location, $image_meta, $attachment_id );
 }
 
@@ -1570 +1572 @@
  * @since 5.5.0
  *
- * @param string $image_src  The image source file.
- * @param array  $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
+ * @param string $image_src     The image source file.
+ * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
+ * @param int    $attachment_id Optional. The image attachment ID. Default 0.
  * @return array|false Array with first element being the width and second element being the height,
  *                     or false if dimensions cannot be determined.
  */
-function wp_image_src_get_dimensions( $image_src, $image_meta ) {
-    if ( ! wp_image_file_matches_image_meta( $image_src, $image_meta ) ) {
+function wp_image_src_get_dimensions( $image_src, $image_meta, $attachment_id = 0 ) {
+    if ( ! wp_image_file_matches_image_meta( $image_src, $image_meta, $attachment_id ) ) {
         return false;
     }
@@ -1644 +1647 @@
         $size_array = array( $width, $height );
     } else {
-        $size_array = wp_image_src_get_dimensions( $image_src, $image_meta );
+        $size_array = wp_image_src_get_dimensions( $image_src, $image_meta, $attachment_id );
         if ( ! $size_array ) {
             return $image;
@@ -1864 +1867 @@
     if ( true === $add ) {
         $image_meta = wp_get_attachment_metadata( $attachment_id );
-        $size_array = wp_image_src_get_dimensions( $image_src, $image_meta );
+        $size_array = wp_image_src_get_dimensions( $image_src, $image_meta, $attachment_id );
 
         if ( $size_array ) {

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -425 +425 @@
             ! $image_meta ||
             ! $image_file ||
-            ! wp_image_file_matches_image_meta( $request['src'], $image_meta )
+            ! wp_image_file_matches_image_meta( $request['src'], $image_meta, $attachment_id )
         ) {
             return new WP_Error(